From ba7231cec615e3dd9c08f9c8d689d43942ba95ec Mon Sep 17 00:00:00 2001 From: Brian Davis Date: Tue, 4 Feb 2020 11:59:59 -0500 Subject: [PATCH] [stable/prometheus-operator] Remove Duplicate Annotations from CRDs (#20544) * remove duplicate CRDs from annotations on prometheus-operator. Signed-off-by: Brian Davis Signed-off-by: Brian Davis --- stable/prometheus-operator/Chart.yaml | 4 ++-- stable/prometheus-operator/crds/crd-alertmanager.yaml | 3 +-- stable/prometheus-operator/crds/crd-podmonitor.yaml | 3 +-- stable/prometheus-operator/crds/crd-prometheus.yaml | 3 +-- stable/prometheus-operator/crds/crd-prometheusrules.yaml | 3 +-- stable/prometheus-operator/crds/crd-servicemonitor.yaml | 3 +-- 6 files changed, 7 insertions(+), 12 deletions(-) diff --git a/stable/prometheus-operator/Chart.yaml b/stable/prometheus-operator/Chart.yaml index 01c6835bb49b..7c4436e586eb 100644 --- a/stable/prometheus-operator/Chart.yaml +++ b/stable/prometheus-operator/Chart.yaml @@ -12,8 +12,8 @@ sources: - https://github.com/coreos/kube-prometheus - https://github.com/coreos/prometheus-operator - https://coreos.com/operators/prometheus -version: 8.7.0 -appVersion: 0.35.0 +version: 8.8.0 +appVersion: 0.36.0 tillerVersion: ">=2.12.0" home: https://github.com/coreos/prometheus-operator keywords: diff --git a/stable/prometheus-operator/crds/crd-alertmanager.yaml b/stable/prometheus-operator/crds/crd-alertmanager.yaml index ca36289d630f..72d22899a128 100644 --- a/stable/prometheus-operator/crds/crd-alertmanager.yaml +++ b/stable/prometheus-operator/crds/crd-alertmanager.yaml @@ -4,10 +4,9 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.2.4 + helm.sh/hook: crd-install creationTimestamp: null name: alertmanagers.monitoring.coreos.com - annotations: - "helm.sh/hook": crd-install spec: group: monitoring.coreos.com names: diff --git a/stable/prometheus-operator/crds/crd-podmonitor.yaml b/stable/prometheus-operator/crds/crd-podmonitor.yaml index 02dcb7fc3e82..6ce239cf2c7d 100644 --- a/stable/prometheus-operator/crds/crd-podmonitor.yaml +++ b/stable/prometheus-operator/crds/crd-podmonitor.yaml @@ -4,10 +4,9 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.2.4 + helm.sh/hook: crd-install creationTimestamp: null name: podmonitors.monitoring.coreos.com - annotations: - "helm.sh/hook": crd-install spec: group: monitoring.coreos.com names: diff --git a/stable/prometheus-operator/crds/crd-prometheus.yaml b/stable/prometheus-operator/crds/crd-prometheus.yaml index 971427739dcd..0c08c659f64c 100644 --- a/stable/prometheus-operator/crds/crd-prometheus.yaml +++ b/stable/prometheus-operator/crds/crd-prometheus.yaml @@ -4,10 +4,9 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.2.4 + helm.sh/hook: crd-install creationTimestamp: null name: prometheuses.monitoring.coreos.com - annotations: - "helm.sh/hook": crd-install spec: group: monitoring.coreos.com names: diff --git a/stable/prometheus-operator/crds/crd-prometheusrules.yaml b/stable/prometheus-operator/crds/crd-prometheusrules.yaml index 1a76f6dd9740..a18e67435a41 100644 --- a/stable/prometheus-operator/crds/crd-prometheusrules.yaml +++ b/stable/prometheus-operator/crds/crd-prometheusrules.yaml @@ -4,10 +4,9 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.2.4 + helm.sh/hook: crd-install creationTimestamp: null name: prometheusrules.monitoring.coreos.com - annotations: - "helm.sh/hook": crd-install spec: group: monitoring.coreos.com names: diff --git a/stable/prometheus-operator/crds/crd-servicemonitor.yaml b/stable/prometheus-operator/crds/crd-servicemonitor.yaml index f31ef405a730..7e614d036b9f 100644 --- a/stable/prometheus-operator/crds/crd-servicemonitor.yaml +++ b/stable/prometheus-operator/crds/crd-servicemonitor.yaml @@ -4,10 +4,9 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.2.4 + helm.sh/hook: crd-install creationTimestamp: null name: servicemonitors.monitoring.coreos.com - annotations: - "helm.sh/hook": crd-install spec: group: monitoring.coreos.com names: