From 40a45fcf7dfec3e925523d322ec4131cba775f24 Mon Sep 17 00:00:00 2001 From: Frederic Branczyk <fbranczyk@gmail.com> Date: Wed, 23 Aug 2017 14:36:00 +0200 Subject: [PATCH] *: adapt all manifests from v1alpha1 to v1 --- manifests/alertmanager/alertmanager.yaml | 8 ++++---- manifests/examples/basic-auth/service-monitor.yaml | 2 +- manifests/examples/example-app/prometheus-frontend.yaml | 2 +- .../examples/example-app/servicemonitor-frontend.yaml | 2 +- .../prometheus-k8s-service-monitor-alertmanager.yaml | 2 +- .../prometheus-k8s-service-monitor-apiserver.yaml | 2 +- ...theus-k8s-service-monitor-kube-controller-manager.yaml | 2 +- .../prometheus-k8s-service-monitor-kube-scheduler.yaml | 2 +- ...prometheus-k8s-service-monitor-kube-state-metrics.yaml | 2 +- .../prometheus-k8s-service-monitor-kubelet.yaml | 2 +- .../prometheus-k8s-service-monitor-node-exporter.yaml | 2 +- ...rometheus-k8s-service-monitor-prometheus-operator.yaml | 2 +- .../prometheus-k8s-service-monitor-prometheus.yaml | 2 +- manifests/prometheus/prometheus-k8s.yaml | 2 +- 14 files changed, 17 insertions(+), 17 deletions(-) diff --git a/manifests/alertmanager/alertmanager.yaml b/manifests/alertmanager/alertmanager.yaml index 91f46bb4..bba9ff2e 100644 --- a/manifests/alertmanager/alertmanager.yaml +++ b/manifests/alertmanager/alertmanager.yaml @@ -1,9 +1,9 @@ -apiVersion: "monitoring.coreos.com/v1alpha1" -kind: "Alertmanager" +apiVersion: monitoring.coreos.com/v1 +kind: Alertmanager metadata: - name: "main" + name: main labels: - alertmanager: "main" + alertmanager: main spec: replicas: 3 version: v0.7.1 diff --git a/manifests/examples/basic-auth/service-monitor.yaml b/manifests/examples/basic-auth/service-monitor.yaml index 52428b1d..e62b9fa9 100644 --- a/manifests/examples/basic-auth/service-monitor.yaml +++ b/manifests/examples/basic-auth/service-monitor.yaml @@ -1,4 +1,4 @@ -apiVersion: monitoring.coreos.com/v1alpha1 +apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: labels: diff --git a/manifests/examples/example-app/prometheus-frontend.yaml b/manifests/examples/example-app/prometheus-frontend.yaml index c092d8e2..f0341d51 100644 --- a/manifests/examples/example-app/prometheus-frontend.yaml +++ b/manifests/examples/example-app/prometheus-frontend.yaml @@ -1,4 +1,4 @@ -apiVersion: monitoring.coreos.com/v1alpha1 +apiVersion: monitoring.coreos.com/v1 kind: Prometheus metadata: name: frontend diff --git a/manifests/examples/example-app/servicemonitor-frontend.yaml b/manifests/examples/example-app/servicemonitor-frontend.yaml index 4ceaacd6..cc3d42fa 100644 --- a/manifests/examples/example-app/servicemonitor-frontend.yaml +++ b/manifests/examples/example-app/servicemonitor-frontend.yaml @@ -1,4 +1,4 @@ -apiVersion: monitoring.coreos.com/v1alpha1 +apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: name: frontend diff --git a/manifests/prometheus/prometheus-k8s-service-monitor-alertmanager.yaml b/manifests/prometheus/prometheus-k8s-service-monitor-alertmanager.yaml index e0e33f9d..19669e3e 100644 --- a/manifests/prometheus/prometheus-k8s-service-monitor-alertmanager.yaml +++ b/manifests/prometheus/prometheus-k8s-service-monitor-alertmanager.yaml @@ -1,4 +1,4 @@ -apiVersion: monitoring.coreos.com/v1alpha1 +apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: name: alertmanager diff --git a/manifests/prometheus/prometheus-k8s-service-monitor-apiserver.yaml b/manifests/prometheus/prometheus-k8s-service-monitor-apiserver.yaml index 09a87c2e..40361f04 100644 --- a/manifests/prometheus/prometheus-k8s-service-monitor-apiserver.yaml +++ b/manifests/prometheus/prometheus-k8s-service-monitor-apiserver.yaml @@ -1,4 +1,4 @@ -apiVersion: monitoring.coreos.com/v1alpha1 +apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: name: kube-apiserver diff --git a/manifests/prometheus/prometheus-k8s-service-monitor-kube-controller-manager.yaml b/manifests/prometheus/prometheus-k8s-service-monitor-kube-controller-manager.yaml index eef95a84..681c320d 100644 --- a/manifests/prometheus/prometheus-k8s-service-monitor-kube-controller-manager.yaml +++ b/manifests/prometheus/prometheus-k8s-service-monitor-kube-controller-manager.yaml @@ -1,4 +1,4 @@ -apiVersion: monitoring.coreos.com/v1alpha1 +apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: name: kube-controller-manager diff --git a/manifests/prometheus/prometheus-k8s-service-monitor-kube-scheduler.yaml b/manifests/prometheus/prometheus-k8s-service-monitor-kube-scheduler.yaml index 663f8cfb..6927f58e 100644 --- a/manifests/prometheus/prometheus-k8s-service-monitor-kube-scheduler.yaml +++ b/manifests/prometheus/prometheus-k8s-service-monitor-kube-scheduler.yaml @@ -1,4 +1,4 @@ -apiVersion: monitoring.coreos.com/v1alpha1 +apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: name: kube-scheduler diff --git a/manifests/prometheus/prometheus-k8s-service-monitor-kube-state-metrics.yaml b/manifests/prometheus/prometheus-k8s-service-monitor-kube-state-metrics.yaml index a276702a..6563a4d4 100644 --- a/manifests/prometheus/prometheus-k8s-service-monitor-kube-state-metrics.yaml +++ b/manifests/prometheus/prometheus-k8s-service-monitor-kube-state-metrics.yaml @@ -1,4 +1,4 @@ -apiVersion: monitoring.coreos.com/v1alpha1 +apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: name: kube-state-metrics diff --git a/manifests/prometheus/prometheus-k8s-service-monitor-kubelet.yaml b/manifests/prometheus/prometheus-k8s-service-monitor-kubelet.yaml index 0eac9630..60ddc0c4 100644 --- a/manifests/prometheus/prometheus-k8s-service-monitor-kubelet.yaml +++ b/manifests/prometheus/prometheus-k8s-service-monitor-kubelet.yaml @@ -1,4 +1,4 @@ -apiVersion: monitoring.coreos.com/v1alpha1 +apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: name: kubelet diff --git a/manifests/prometheus/prometheus-k8s-service-monitor-node-exporter.yaml b/manifests/prometheus/prometheus-k8s-service-monitor-node-exporter.yaml index b68ed89f..e1b083bb 100644 --- a/manifests/prometheus/prometheus-k8s-service-monitor-node-exporter.yaml +++ b/manifests/prometheus/prometheus-k8s-service-monitor-node-exporter.yaml @@ -1,4 +1,4 @@ -apiVersion: monitoring.coreos.com/v1alpha1 +apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: name: node-exporter diff --git a/manifests/prometheus/prometheus-k8s-service-monitor-prometheus-operator.yaml b/manifests/prometheus/prometheus-k8s-service-monitor-prometheus-operator.yaml index 23c04073..0b8028e7 100644 --- a/manifests/prometheus/prometheus-k8s-service-monitor-prometheus-operator.yaml +++ b/manifests/prometheus/prometheus-k8s-service-monitor-prometheus-operator.yaml @@ -1,4 +1,4 @@ -apiVersion: monitoring.coreos.com/v1alpha1 +apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: name: prometheus-operator diff --git a/manifests/prometheus/prometheus-k8s-service-monitor-prometheus.yaml b/manifests/prometheus/prometheus-k8s-service-monitor-prometheus.yaml index bfcb4e31..c3d11e57 100644 --- a/manifests/prometheus/prometheus-k8s-service-monitor-prometheus.yaml +++ b/manifests/prometheus/prometheus-k8s-service-monitor-prometheus.yaml @@ -1,4 +1,4 @@ -apiVersion: monitoring.coreos.com/v1alpha1 +apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: name: prometheus diff --git a/manifests/prometheus/prometheus-k8s.yaml b/manifests/prometheus/prometheus-k8s.yaml index 066997ee..421c024d 100644 --- a/manifests/prometheus/prometheus-k8s.yaml +++ b/manifests/prometheus/prometheus-k8s.yaml @@ -1,4 +1,4 @@ -apiVersion: monitoring.coreos.com/v1alpha1 +apiVersion: monitoring.coreos.com/v1 kind: Prometheus metadata: name: k8s -- GitLab