diff --git a/hack/cluster-monitoring/deploy b/hack/cluster-monitoring/deploy index eaca3f012133b7428749268adbfb50861ee02ea0..5d20f8a6ee32ff5740017c2e2636f05227ff1ee4 100755 --- a/hack/cluster-monitoring/deploy +++ b/hack/cluster-monitoring/deploy @@ -10,7 +10,7 @@ kctl() { kubectl --kubeconfig="$KUBECONFIG" -n "monitoring" "$@" } -kctl apply -f manifests/controllers/prometheus-controller.yaml +kctl apply -f manifests/prometheus-operator.yaml # Wait for TPRs to be ready. until kctl get servicemonitor; do sleep 0.1; done diff --git a/hack/cluster-monitoring/teardown b/hack/cluster-monitoring/teardown index 54b35adabf636581cb97aa24718db1182853f8a7..a6edb0ae20f327d3557e66ced48fca370217b12a 100755 --- a/hack/cluster-monitoring/teardown +++ b/hack/cluster-monitoring/teardown @@ -15,4 +15,4 @@ kctl delete -f manifests/prometheus # Hack: wait a bit to let the controller delete the deployed Prometheus server. sleep 5 -kctl delete -f manifests/controllers/prometheus-controller.yaml +kctl delete -f manifests/prometheus-operator.yaml diff --git a/manifests/operators/prometheus-operator.yaml b/manifests/prometheus-operator.yaml similarity index 69% rename from manifests/operators/prometheus-operator.yaml rename to manifests/prometheus-operator.yaml index c6fa2f5303a9d7fd97bb75c12afba6559a4b20ee..abedb9325f14a5640d3c0348110cd4d77b17ad3a 100644 --- a/manifests/operators/prometheus-operator.yaml +++ b/manifests/prometheus-operator.yaml @@ -1,18 +1,18 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: - name: prometheus-controller + name: prometheus-operator labels: - controller: prometheus + operator: prometheus spec: replicas: 1 template: metadata: labels: - controller: prometheus + operator: prometheus spec: containers: - - name: prometheus-controller + - name: prometheus-operator image: quay.io/coreos/prometheus-operator:latest resources: requests: @@ -20,4 +20,4 @@ spec: memory: 50Mi limits: cpu: 200m - memory: 100Mi + memory: 300Mi