Skip to content

Commit dea18bd

Browse files
authored
Fix staging issuers for grafana/vm certs (#291)
1 parent 2cb168f commit dea18bd

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

addons/grafana-on-gcp-oauth.libsonnet

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ function(config) {
66
assert std.objectHas(config.grafana, 'GCPExternalIpAddress') : 'grafana.GCPExternalIpAddress required',
77
assert std.objectHas(config.grafana, 'IAPClientID') : 'grafana.IAPClientID required',
88
assert std.objectHas(config.grafana, 'IAPClientSecret') : 'grafana.IAPClientSecret required',
9+
assert std.objectHas(config.grafana, 'issuer') : 'grafana.issuer required',
910

1011
grafana+: {
1112
// Certmanager must be installed in the cluster already!
@@ -22,7 +23,7 @@ function(config) {
2223
],
2324
issuerRef: {
2425
kind: 'ClusterIssuer',
25-
name: 'letsencrypt-issuer-gitpod-191109',
26+
name: config.grafana.issuer,
2627
},
2728
secretName: 'grafana-certificate',
2829
},

components/victoriametrics/victoriametrics.libsonnet

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ local config = std.extVar('config');
33
local defaults = {
44
local defaults = self,
55

6-
76
name: 'victoriametrics',
87
namespace: 'monitoring-central',
98
version: 'v1.47.0',
@@ -14,6 +13,7 @@ local defaults = {
1413
'app.kubernetes.io/name': defaults.name,
1514
'app.kubernetes.io/part-of': 'monitoring-central',
1615
},
16+
issuer: 'letsencrypt-issuer-gitpod-191109',
1717
};
1818

1919
function(params) {
@@ -304,7 +304,7 @@ function(params) {
304304
],
305305
issuerRef: {
306306
kind: 'ClusterIssuer',
307-
name: 'letsencrypt-issuer-gitpod-191109',
307+
name: config.victoriametrics.issuer,
308308
},
309309
secretName: 'victoriametrics-certificate',
310310
},

hack/generate.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,13 +121,15 @@ jsonnet -c -J vendor -m monitoring-central/manifests \
121121
GCPExternalIpAddress: 'fake_external_ip_address',
122122
IAPClientID: 'fakeIAP_ID',
123123
IAPClientSecret: 'fakeIAP_secret',
124+
issuer: 'issuer-123',
124125
},
125126
victoriametrics: {
126127
DNS: 'http://fake.victoriametrics.url',
127128
authKey: 'random-key',
128129
username: 'p@ssW0rd',
129130
password: 'user',
130131
GCPExternalIpAddress: 'fake_external_ip_address',
132+
issuer: 'issuer-123',
131133
},
132134
stackdriver: {
133135
clientEmail: '[email protected]',

0 commit comments

Comments
 (0)