From e85d2f3b64c65f81aec7093dda880376a6719fe1 Mon Sep 17 00:00:00 2001
From: Josh Tilles <MerelyAPseudonym@gmail.com>
Date: Mon, 10 Jun 2019 14:16:41 -0400
Subject: [PATCH] =?UTF-8?q?Depend=20on=20operator=E2=80=99s=20`release-0.3?=
=?UTF-8?q?0`=20branch?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Note that, in effect, this also leads to kube-prometheus using
the latest patch-release of prometheus-operator, 0.30.1.
---
jsonnet/kube-prometheus/jsonnetfile.json | 2 +-
jsonnetfile.lock.json | 2 +-
manifests/alertmanager-secret.yaml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/jsonnet/kube-prometheus/jsonnetfile.json b/jsonnet/kube-prometheus/jsonnetfile.json
index ac201dd2..ec6ee8e7 100644
--- a/jsonnet/kube-prometheus/jsonnetfile.json
+++ b/jsonnet/kube-prometheus/jsonnetfile.json
@@ -38,7 +38,7 @@
"subdir": "jsonnet/prometheus-operator"
}
},
- "version": "v0.30.0"
+ "version": "release-0.30"
},
{
"name": "etcd-mixin",
diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
index 03839d3b..851982e6 100644
--- a/jsonnetfile.lock.json
+++ b/jsonnetfile.lock.json
@@ -68,7 +68,7 @@
"subdir": "jsonnet/prometheus-operator"
}
},
- "version": "1b202471cb9847282198ec008b58bd7c34d9d2ff"
+ "version": "18fbf558ab7f8809fd610a3dc50bf483508dc1bb"
},
{
"name": "etcd-mixin",
diff --git a/manifests/alertmanager-secret.yaml b/manifests/alertmanager-secret.yaml
index 5ee9c606..cdfe51c7 100644
--- a/manifests/alertmanager-secret.yaml
+++ b/manifests/alertmanager-secret.yaml
@@ -1,6 +1,6 @@
apiVersion: v1
data:
- alertmanager.yaml: Imdsb2JhbCI6IAogICJyZXNvbHZlX3RpbWVvdXQiOiAiNW0iCiJyZWNlaXZlcnMiOiAKLSAibmFtZSI6ICJudWxsIgoicm91dGUiOiAKICAiZ3JvdXBfYnkiOiAKICAtICJqb2IiCiAgImdyb3VwX2ludGVydmFsIjogIjVtIgogICJncm91cF93YWl0IjogIjMwcyIKICAicmVjZWl2ZXIiOiAibnVsbCIKICAicmVwZWF0X2ludGVydmFsIjogIjEyaCIKICAicm91dGVzIjogCiAgLSAibWF0Y2giOiAKICAgICAgImFsZXJ0bmFtZSI6ICJXYXRjaGRvZyIKICAgICJyZWNlaXZlciI6ICJudWxsIg==
+ alertmanager.yaml: Imdsb2JhbCI6CiAgInJlc29sdmVfdGltZW91dCI6ICI1bSIKInJlY2VpdmVycyI6Ci0gIm5hbWUiOiAibnVsbCIKInJvdXRlIjoKICAiZ3JvdXBfYnkiOgogIC0gImpvYiIKICAiZ3JvdXBfaW50ZXJ2YWwiOiAiNW0iCiAgImdyb3VwX3dhaXQiOiAiMzBzIgogICJyZWNlaXZlciI6ICJudWxsIgogICJyZXBlYXRfaW50ZXJ2YWwiOiAiMTJoIgogICJyb3V0ZXMiOgogIC0gIm1hdGNoIjoKICAgICAgImFsZXJ0bmFtZSI6ICJXYXRjaGRvZyIKICAgICJyZWNlaXZlciI6ICJudWxsIg==
kind: Secret
metadata:
name: alertmanager-main
--
GitLab