[stable/prometheus-operator] Remove Duplicate Annotations from CRDs (h…

…elm#20544) * remove duplicate CRDs from annotations on prometheus-operator. Signed-off-by: Brian Davis <slimm609@gmail.com>
slimm609 · Feb 4, 2020 · 8cc1ce1 · 8cc1ce1
1 parent 98a5b82
commit 8cc1ce1
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 12 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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: