From 5c8f4e89a180f9f04c32c0107d3b3caf27ba9a1a Mon Sep 17 00:00:00 2001 From: Justin Scott Date: Wed, 2 Oct 2019 11:13:03 -0700 Subject: [PATCH] Update Prometheus to v0.2.0 (#196) Signed-off-by: Justin Scott --- .../kustomization.yaml | 68 +++++++++++++++++++ .../overlays/v0.2.0/kustomization.yaml | 65 ++++++++++++++++++ clr-k8s-examples/create_stack.sh | 5 +- 3 files changed, 136 insertions(+), 2 deletions(-) create mode 100644 clr-k8s-examples/4-kube-prometheus/overlays/f458e85e5d7675f7bc253072e1b4c8892b51af0f/kustomization.yaml create mode 100644 clr-k8s-examples/4-kube-prometheus/overlays/v0.2.0/kustomization.yaml diff --git a/clr-k8s-examples/4-kube-prometheus/overlays/f458e85e5d7675f7bc253072e1b4c8892b51af0f/kustomization.yaml b/clr-k8s-examples/4-kube-prometheus/overlays/f458e85e5d7675f7bc253072e1b4c8892b51af0f/kustomization.yaml new file mode 100644 index 0000000..d767432 --- /dev/null +++ b/clr-k8s-examples/4-kube-prometheus/overlays/f458e85e5d7675f7bc253072e1b4c8892b51af0f/kustomization.yaml @@ -0,0 +1,68 @@ +# This is a temporary reference commit until a working prometheus for 1.16 is released +# (dashboard-deployment api version not updated in v0.2.0, breaking k8s 1.16) +# f458e85e5d7675f7bc253072e1b4c8892b51af0f +resources: + - kube-prometheus/manifests/00namespace-namespace.yaml + - kube-prometheus/manifests/0prometheus-operator-0alertmanagerCustomResourceDefinition.yaml + - kube-prometheus/manifests/0prometheus-operator-0prometheusCustomResourceDefinition.yaml + - kube-prometheus/manifests/0prometheus-operator-0prometheusruleCustomResourceDefinition.yaml + - kube-prometheus/manifests/0prometheus-operator-0servicemonitorCustomResourceDefinition.yaml + - kube-prometheus/manifests/0prometheus-operator-clusterRoleBinding.yaml + - kube-prometheus/manifests/0prometheus-operator-clusterRole.yaml + - kube-prometheus/manifests/0prometheus-operator-deployment.yaml + - kube-prometheus/manifests/0prometheus-operator-serviceAccount.yaml + - kube-prometheus/manifests/0prometheus-operator-serviceMonitor.yaml + - kube-prometheus/manifests/0prometheus-operator-service.yaml + - kube-prometheus/manifests/alertmanager-alertmanager.yaml + - kube-prometheus/manifests/alertmanager-secret.yaml + - kube-prometheus/manifests/alertmanager-serviceAccount.yaml + - kube-prometheus/manifests/alertmanager-serviceMonitor.yaml + - kube-prometheus/manifests/alertmanager-service.yaml + - kube-prometheus/manifests/grafana-dashboardDatasources.yaml + - kube-prometheus/manifests/grafana-dashboardDefinitions.yaml + - kube-prometheus/manifests/grafana-dashboardSources.yaml + - kube-prometheus/manifests/grafana-deployment.yaml + - kube-prometheus/manifests/grafana-serviceAccount.yaml + - kube-prometheus/manifests/grafana-serviceMonitor.yaml + - kube-prometheus/manifests/grafana-service.yaml + - kube-prometheus/manifests/kube-state-metrics-clusterRoleBinding.yaml + - kube-prometheus/manifests/kube-state-metrics-clusterRole.yaml + - kube-prometheus/manifests/kube-state-metrics-deployment.yaml + - kube-prometheus/manifests/kube-state-metrics-roleBinding.yaml + - kube-prometheus/manifests/kube-state-metrics-role.yaml + - kube-prometheus/manifests/kube-state-metrics-serviceAccount.yaml + - kube-prometheus/manifests/kube-state-metrics-serviceMonitor.yaml + - kube-prometheus/manifests/kube-state-metrics-service.yaml + - kube-prometheus/manifests/node-exporter-clusterRoleBinding.yaml + - kube-prometheus/manifests/node-exporter-clusterRole.yaml + - kube-prometheus/manifests/node-exporter-daemonset.yaml + - kube-prometheus/manifests/node-exporter-serviceAccount.yaml + - kube-prometheus/manifests/node-exporter-serviceMonitor.yaml + - kube-prometheus/manifests/node-exporter-service.yaml + - kube-prometheus/manifests/prometheus-adapter-apiService.yaml + - kube-prometheus/manifests/prometheus-adapter-clusterRoleAggregatedMetricsReader.yaml + - kube-prometheus/manifests/prometheus-adapter-clusterRoleBindingDelegator.yaml + - kube-prometheus/manifests/prometheus-adapter-clusterRoleBinding.yaml + - kube-prometheus/manifests/prometheus-adapter-clusterRoleServerResources.yaml + - kube-prometheus/manifests/prometheus-adapter-clusterRole.yaml + - kube-prometheus/manifests/prometheus-adapter-configMap.yaml + - kube-prometheus/manifests/prometheus-adapter-deployment.yaml + - kube-prometheus/manifests/prometheus-adapter-roleBindingAuthReader.yaml + - kube-prometheus/manifests/prometheus-adapter-serviceAccount.yaml + - kube-prometheus/manifests/prometheus-adapter-service.yaml + - kube-prometheus/manifests/prometheus-clusterRoleBinding.yaml + - kube-prometheus/manifests/prometheus-clusterRole.yaml + - kube-prometheus/manifests/prometheus-prometheus.yaml + - kube-prometheus/manifests/prometheus-roleBindingConfig.yaml + - kube-prometheus/manifests/prometheus-roleBindingSpecificNamespaces.yaml + - kube-prometheus/manifests/prometheus-roleConfig.yaml + - kube-prometheus/manifests/prometheus-roleSpecificNamespaces.yaml + - kube-prometheus/manifests/prometheus-rules.yaml + - kube-prometheus/manifests/prometheus-serviceAccount.yaml + - kube-prometheus/manifests/prometheus-serviceMonitorApiserver.yaml + - kube-prometheus/manifests/prometheus-serviceMonitorCoreDNS.yaml + - kube-prometheus/manifests/prometheus-serviceMonitorKubeControllerManager.yaml + - kube-prometheus/manifests/prometheus-serviceMonitorKubelet.yaml + - kube-prometheus/manifests/prometheus-serviceMonitorKubeScheduler.yaml + - kube-prometheus/manifests/prometheus-serviceMonitor.yaml + - kube-prometheus/manifests/prometheus-service.yaml diff --git a/clr-k8s-examples/4-kube-prometheus/overlays/v0.2.0/kustomization.yaml b/clr-k8s-examples/4-kube-prometheus/overlays/v0.2.0/kustomization.yaml new file mode 100644 index 0000000..5cfb2cb --- /dev/null +++ b/clr-k8s-examples/4-kube-prometheus/overlays/v0.2.0/kustomization.yaml @@ -0,0 +1,65 @@ +resources: + - kube-prometheus/manifests/00namespace-namespace.yaml + - kube-prometheus/manifests/0prometheus-operator-0alertmanagerCustomResourceDefinition.yaml + - kube-prometheus/manifests/0prometheus-operator-0prometheusCustomResourceDefinition.yaml + - kube-prometheus/manifests/0prometheus-operator-0prometheusruleCustomResourceDefinition.yaml + - kube-prometheus/manifests/0prometheus-operator-0servicemonitorCustomResourceDefinition.yaml + - kube-prometheus/manifests/0prometheus-operator-clusterRoleBinding.yaml + - kube-prometheus/manifests/0prometheus-operator-clusterRole.yaml + - kube-prometheus/manifests/0prometheus-operator-deployment.yaml + - kube-prometheus/manifests/0prometheus-operator-serviceAccount.yaml + - kube-prometheus/manifests/0prometheus-operator-serviceMonitor.yaml + - kube-prometheus/manifests/0prometheus-operator-service.yaml + - kube-prometheus/manifests/alertmanager-alertmanager.yaml + - kube-prometheus/manifests/alertmanager-secret.yaml + - kube-prometheus/manifests/alertmanager-serviceAccount.yaml + - kube-prometheus/manifests/alertmanager-serviceMonitor.yaml + - kube-prometheus/manifests/alertmanager-service.yaml + - kube-prometheus/manifests/grafana-dashboardDatasources.yaml + - kube-prometheus/manifests/grafana-dashboardDefinitions.yaml + - kube-prometheus/manifests/grafana-dashboardSources.yaml + - kube-prometheus/manifests/grafana-deployment.yaml + - kube-prometheus/manifests/grafana-serviceAccount.yaml + - kube-prometheus/manifests/grafana-serviceMonitor.yaml + - kube-prometheus/manifests/grafana-service.yaml + - kube-prometheus/manifests/kube-state-metrics-clusterRoleBinding.yaml + - kube-prometheus/manifests/kube-state-metrics-clusterRole.yaml + - kube-prometheus/manifests/kube-state-metrics-deployment.yaml + - kube-prometheus/manifests/kube-state-metrics-roleBinding.yaml + - kube-prometheus/manifests/kube-state-metrics-role.yaml + - kube-prometheus/manifests/kube-state-metrics-serviceAccount.yaml + - kube-prometheus/manifests/kube-state-metrics-serviceMonitor.yaml + - kube-prometheus/manifests/kube-state-metrics-service.yaml + - kube-prometheus/manifests/node-exporter-clusterRoleBinding.yaml + - kube-prometheus/manifests/node-exporter-clusterRole.yaml + - kube-prometheus/manifests/node-exporter-daemonset.yaml + - kube-prometheus/manifests/node-exporter-serviceAccount.yaml + - kube-prometheus/manifests/node-exporter-serviceMonitor.yaml + - kube-prometheus/manifests/node-exporter-service.yaml + - kube-prometheus/manifests/prometheus-adapter-apiService.yaml + - kube-prometheus/manifests/prometheus-adapter-clusterRoleAggregatedMetricsReader.yaml + - kube-prometheus/manifests/prometheus-adapter-clusterRoleBindingDelegator.yaml + - kube-prometheus/manifests/prometheus-adapter-clusterRoleBinding.yaml + - kube-prometheus/manifests/prometheus-adapter-clusterRoleServerResources.yaml + - kube-prometheus/manifests/prometheus-adapter-clusterRole.yaml + - kube-prometheus/manifests/prometheus-adapter-configMap.yaml + - kube-prometheus/manifests/prometheus-adapter-deployment.yaml + - kube-prometheus/manifests/prometheus-adapter-roleBindingAuthReader.yaml + - kube-prometheus/manifests/prometheus-adapter-serviceAccount.yaml + - kube-prometheus/manifests/prometheus-adapter-service.yaml + - kube-prometheus/manifests/prometheus-clusterRoleBinding.yaml + - kube-prometheus/manifests/prometheus-clusterRole.yaml + - kube-prometheus/manifests/prometheus-prometheus.yaml + - kube-prometheus/manifests/prometheus-roleBindingConfig.yaml + - kube-prometheus/manifests/prometheus-roleBindingSpecificNamespaces.yaml + - kube-prometheus/manifests/prometheus-roleConfig.yaml + - kube-prometheus/manifests/prometheus-roleSpecificNamespaces.yaml + - kube-prometheus/manifests/prometheus-rules.yaml + - kube-prometheus/manifests/prometheus-serviceAccount.yaml + - kube-prometheus/manifests/prometheus-serviceMonitorApiserver.yaml + - kube-prometheus/manifests/prometheus-serviceMonitorCoreDNS.yaml + - kube-prometheus/manifests/prometheus-serviceMonitorKubeControllerManager.yaml + - kube-prometheus/manifests/prometheus-serviceMonitorKubelet.yaml + - kube-prometheus/manifests/prometheus-serviceMonitorKubeScheduler.yaml + - kube-prometheus/manifests/prometheus-serviceMonitor.yaml + - kube-prometheus/manifests/prometheus-service.yaml diff --git a/clr-k8s-examples/create_stack.sh b/clr-k8s-examples/create_stack.sh index 758060f..b1df867 100755 --- a/clr-k8s-examples/create_stack.sh +++ b/clr-k8s-examples/create_stack.sh @@ -19,6 +19,7 @@ CANAL_VER="${CLRK8S_CANAL_VER:-v3.9}" K8S_VER="${CLRK8S_K8S_VER:-}" ROOK_VER="${CLRK8S_ROOK_VER:-v1.1.0}" METRICS_VER="${CLRK8S_METRICS_VER:-v0.3.5}" +PROMETHEUS_VER="${CLRK8S_PROMETHEUS_VER:-f458e85e5d7675f7bc253072e1b4c8892b51af0f}" function print_usage_exit() { exit_code=${1:-0} @@ -111,7 +112,7 @@ function cni() { mkdir -p "${CANAL_DIR}/overlays/${CANAL_VER}/canal" curl -o "${CANAL_DIR}/overlays/${CANAL_VER}/canal/canal.yaml" "$CANAL_URL/canal.yaml" if [[ "$CANAL_VER" == "v3.3" ]]; then - curl -o "${CANAL_DIR}/overlays/${CANAL_VER}/canal/rbac.yaml" "$CANAL_URL/rbac.yaml" + curl -o "${CANAL_DIR}/overlays/${CANAL_VER}/canal/rbac.yaml" "$CANAL_URL/rbac.yaml" fi # canal doesnt pass kustomize validation kubectl apply -k "${CANAL_DIR}/overlays/${CANAL_VER}" --validate=false @@ -178,7 +179,7 @@ function storage() { } function monitoring() { - PROMETHEUS_VER=${1:-v0.1.0} + PROMETHEUS_VER=${1:-$PROMETHEUS_VER} PROMETHEUS_URL="https://github.com/coreos/kube-prometheus.git" PROMETHEUS_DIR="4-kube-prometheus" get_repo "${PROMETHEUS_URL}" "${PROMETHEUS_DIR}/overlays/${PROMETHEUS_VER}"