Skip to content

Commit 0a90e66

Browse files
jhoblittjhoblitt
authored
Merge pull request #865 from lsst-it/IT-6034/ayekan-rke2
(ayekan) rke1 -> rke2 conversion
2 parents 625a74a + f9a01b2 commit 0a90e66

File tree

39 files changed

+87
-382
lines changed

39 files changed

+87
-382
lines changed

‎ayekan/external-secrets/README.md

-1
This file was deleted.

‎ayekan/external-secrets/external-secrets.sh

-1
This file was deleted.

‎ayekan/external-secrets/fetch-credentials.sh

-1
This file was deleted.

‎ayekan/rke/.gitignore

-3
This file was deleted.

‎ayekan/rke/Makefile

-1
This file was deleted.

‎ayekan/rke/cluster.yml

-43
This file was deleted.

‎fleet/lib/alertbit/values.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ config:
66
alertmanagers:
77
- static_configs:
88
- targets:
9-
- alertmanager.${ .ClusterName }.${ .ClusterLabels.site }.lsst.org
9+
- alertmanager.${ get .ClusterLabels "management.cattle.io/cluster-display-name" }.${ .ClusterLabels.site }.lsst.org
1010

1111
ingress:
1212
enabled: false

‎fleet/lib/blackbox-exporter/values.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -91,14 +91,14 @@ ingress:
9191
cert-manager.io/cluster-issuer: letsencrypt
9292
nginx.ingress.kubernetes.io/backend-protocol: HTTP
9393
hosts:
94-
- host: blackbox-exporter.${ .ClusterName }.${ .ClusterLabels.site }.lsst.org
94+
- host: blackbox-exporter.${ get .ClusterLabels "management.cattle.io/cluster-display-name" }.${ .ClusterLabels.site }.lsst.org
9595
paths:
9696
- path: /
9797
pathType: Prefix
9898
tls:
9999
- secretName: tls-blackbox-exporter-ingress
100100
hosts:
101-
- blackbox-exporter.${ .ClusterName }.${ .ClusterLabels.site }.lsst.org
101+
- blackbox-exporter.${ get .ClusterLabels "management.cattle.io/cluster-display-name" }.${ .ClusterLabels.site }.lsst.org
102102

103103
config:
104104
modules:

‎fleet/lib/external-secrets-conf/fleet.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ helm:
1313
clusterSecretStores:
1414
onepassword:
1515
vaults:
16-
${ .ClusterName }.${ .ClusterLabels.site }: 1
16+
${ get .ClusterLabels "management.cattle.io/cluster-display-name" }.${ .ClusterLabels.site }: 1
1717
k8s-${ .ClusterLabels.site }: 2
1818
k8s-common: 3
1919
dependsOn:
@@ -35,7 +35,7 @@ targetCustomizations:
3535
onepassword:
3636
vaults:
3737
# helm merges the maps, so we need to remove the default 1 vault
38-
${ .ClusterName }.${ .ClusterLabels.site }: ~
38+
${ get .ClusterLabels "management.cattle.io/cluster-display-name" }.${ .ClusterLabels.site }: ~
3939
# it probaly would have been easier to name the vaults local.<site>...
4040
rancher.${ .ClusterLabels.site }: 1
4141
- name: oods-cluster

‎fleet/lib/fleet-conf/overlays/dev/gitrepo-ayekan.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ spec:
1414
- name: ayekan
1515
clusterName: ayekan
1616
correctDrift:
17-
enabled: false # XXX do not enable because of rook
17+
enabled: true

‎fleet/lib/fluent-bit-external/values.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -301,15 +301,15 @@ config:
301301
[FILTER]
302302
name modify
303303
match *
304-
add prom_cluster ${ .ClusterName }.${ .ClusterLabels.site }
304+
add prom_cluster ${ get .ClusterLabels "management.cattle.io/cluster-display-name" }.${ .ClusterLabels.site }
305305
306306
## https://docs.fluentbit.io/manual/pipeline/outputs
307307
outputs: |
308308
[Output]
309309
Name opensearch
310310
Buffer_Size 1M
311311
Match_Regex (?:rsyslog)\.(.*)
312-
Host opensearch.${ .ClusterName }.${ .ClusterLabels.site }.lsst.org
312+
Host opensearch.${ get .ClusterLabels "management.cattle.io/cluster-display-name" }.${ .ClusterLabels.site }.lsst.org
313313
Port 9200
314314
HTTP_User ${`${OS_LOGGING_USERNAME}`}
315315
HTTP_Passwd ${`${OS_LOGGING_PASSWORD}`}
@@ -324,7 +324,7 @@ config:
324324
Name opensearch
325325
Buffer_Size 1M
326326
Match_Regex (?:firewall)\.(.*)
327-
Host opensearch.${ .ClusterName }.${ .ClusterLabels.site }.lsst.org
327+
Host opensearch.${ get .ClusterLabels "management.cattle.io/cluster-display-name" }.${ .ClusterLabels.site }.lsst.org
328328
Port 9200
329329
HTTP_User ${`${OS_LOGGING_USERNAME}`}
330330
HTTP_Passwd ${`${OS_LOGGING_PASSWORD}`}
@@ -339,7 +339,7 @@ config:
339339
Name opensearch
340340
Buffer_Size 1M
341341
Match_Regex (?:netlog)\.(.*)
342-
Host opensearch.${ .ClusterName }.${ .ClusterLabels.site }.lsst.org
342+
Host opensearch.${ get .ClusterLabels "management.cattle.io/cluster-display-name" }.${ .ClusterLabels.site }.lsst.org
343343
Port 9200
344344
HTTP_User ${`${OS_LOGGING_USERNAME}`}
345345
HTTP_Passwd ${`${OS_LOGGING_PASSWORD}`}

‎fleet/lib/fluent-bit-kube/values.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ config:
301301
[FILTER]
302302
name modify
303303
match *
304-
add prom_cluster ${ .ClusterName }.${ .ClusterLabels.site }
304+
add prom_cluster ${ get .ClusterLabels "management.cattle.io/cluster-display-name" }.${ .ClusterLabels.site }
305305
306306
## https://docs.fluentbit.io/manual/pipeline/outputs
307307
outputs: |

‎fleet/lib/keycloak/values.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ ingress:
2424
servicePort: http
2525
annotations:
2626
cert-manager.io/cluster-issuer: letsencrypt
27-
hostname: keycloak.${ .ClusterName }.${ .ClusterLabels.site }.lsst.org
27+
hostname: keycloak.${ get .ClusterLabels "management.cattle.io/cluster-display-name" }.${ .ClusterLabels.site }.lsst.org
2828
tls: true
2929

3030
auth:

‎fleet/lib/kube-prometheus-stack/aggregator/values.yaml

+14-14
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
prometheus:
33
prometheusSpec:
4-
externalUrl: https://prometheus.${ .ClusterName }.${ .ClusterLabels.site }.lsst.org
4+
externalUrl: https://prometheus.${ get .ClusterLabels "management.cattle.io/cluster-display-name" }.${ .ClusterLabels.site }.lsst.org
55
remoteWrite:
66
- url: http://mimir-distributed-gateway.mimir:80/api/v1/push
77
ingress:
@@ -14,15 +14,15 @@ prometheus:
1414
- /
1515
pathType: Prefix
1616
hosts:
17-
- prometheus.${ .ClusterName }.${ .ClusterLabels.site }.lsst.org
17+
- prometheus.${ get .ClusterLabels "management.cattle.io/cluster-display-name" }.${ .ClusterLabels.site }.lsst.org
1818
tls:
1919
- secretName: tls-prometheus-ingress
2020
hosts:
21-
- prometheus.${ .ClusterName }.${ .ClusterLabels.site }.lsst.org
21+
- prometheus.${ get .ClusterLabels "management.cattle.io/cluster-display-name" }.${ .ClusterLabels.site }.lsst.org
2222

2323
alertmanager:
2424
alertmanagerSpec:
25-
externalUrl: https://alertmanager.${ .ClusterName }.${ .ClusterLabels.site }.lsst.org
25+
externalUrl: https://alertmanager.${ get .ClusterLabels "management.cattle.io/cluster-display-name" }.${ .ClusterLabels.site }.lsst.org
2626
secrets:
2727
- alertmanager-webhooks
2828
configMaps:
@@ -37,11 +37,11 @@ alertmanager:
3737
- /
3838
pathType: Prefix
3939
hosts:
40-
- alertmanager.${ .ClusterName }.${ .ClusterLabels.site }.lsst.org
40+
- alertmanager.${ get .ClusterLabels "management.cattle.io/cluster-display-name" }.${ .ClusterLabels.site }.lsst.org
4141
tls:
4242
- secretName: tls-alertmanager-ingress
4343
hosts:
44-
- alertmanager.${ .ClusterName }.${ .ClusterLabels.site }.lsst.org
44+
- alertmanager.${ get .ClusterLabels "management.cattle.io/cluster-display-name" }.${ .ClusterLabels.site }.lsst.org
4545
config:
4646
global:
4747
resolve_timeout: 5m
@@ -82,8 +82,8 @@ grafana:
8282
type: Recreate # default is RollingUpdate, which doesn't work w/ persistence enabled
8383
grafana.ini:
8484
server:
85-
domain: grafana.${ .ClusterName }.${ .ClusterLabels.site }.lsst.org
86-
root_url: https://grafana.${ .ClusterName }.${ .ClusterLabels.site }.lsst.org
85+
domain: grafana.${ get .ClusterLabels "management.cattle.io/cluster-display-name" }.${ .ClusterLabels.site }.lsst.org
86+
root_url: https://grafana.${ get .ClusterLabels "management.cattle.io/cluster-display-name" }.${ .ClusterLabels.site }.lsst.org
8787
feature_toggles:
8888
enable: autoMigrateOldPanels
8989
auth.generic_oauth:
@@ -112,11 +112,11 @@ grafana:
112112
- /
113113
pathType: Prefix
114114
hosts:
115-
- grafana.${ .ClusterName }.${ .ClusterLabels.site }.lsst.org
115+
- grafana.${ get .ClusterLabels "management.cattle.io/cluster-display-name" }.${ .ClusterLabels.site }.lsst.org
116116
tls:
117117
- secretName: tls-grafana-ingress
118118
hosts:
119-
- grafana.${ .ClusterName }.${ .ClusterLabels.site }.lsst.org
119+
- grafana.${ get .ClusterLabels "management.cattle.io/cluster-display-name" }.${ .ClusterLabels.site }.lsst.org
120120
sidecar:
121121
resources:
122122
limits:
@@ -172,7 +172,7 @@ grafana:
172172
uid: os-logs-kube
173173
basicAuth: true
174174
basicAuthUser: $OS_LOGGING_USERNAME
175-
url: https://opensearch.${ .ClusterName }.${ .ClusterLabels.site }.lsst.org
175+
url: https://opensearch.${ get .ClusterLabels "management.cattle.io/cluster-display-name" }.${ .ClusterLabels.site }.lsst.org
176176
access: proxy
177177
jsonData:
178178
database: logs-kube*
@@ -191,7 +191,7 @@ grafana:
191191
uid: os-logs-hosts
192192
basicAuth: true
193193
basicAuthUser: $OS_LOGGING_USERNAME
194-
url: https://opensearch.${ .ClusterName }.${ .ClusterLabels.site }.lsst.org
194+
url: https://opensearch.${ get .ClusterLabels "management.cattle.io/cluster-display-name" }.${ .ClusterLabels.site }.lsst.org
195195
access: proxy
196196
jsonData:
197197
database: logs-hosts*
@@ -210,7 +210,7 @@ grafana:
210210
uid: os-logs-firewall
211211
basicAuth: true
212212
basicAuthUser: $OS_LOGGING_USERNAME
213-
url: https://opensearch.${ .ClusterName }.${ .ClusterLabels.site }.lsst.org
213+
url: https://opensearch.${ get .ClusterLabels "management.cattle.io/cluster-display-name" }.${ .ClusterLabels.site }.lsst.org
214214
access: proxy
215215
jsonData:
216216
database: logs-firewall*
@@ -229,7 +229,7 @@ grafana:
229229
uid: os-logs-network
230230
basicAuth: true
231231
basicAuthUser: $OS_LOGGING_USERNAME
232-
url: https://opensearch.${ .ClusterName }.${ .ClusterLabels.site }.lsst.org
232+
url: https://opensearch.${ get .ClusterLabels "management.cattle.io/cluster-display-name" }.${ .ClusterLabels.site }.lsst.org
233233
access: proxy
234234
jsonData:
235235
database: logs-network*

‎fleet/lib/kube-prometheus-stack/fleet.yaml

-7
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,6 @@ targetCustomizations:
5959
- aggregator/values.yaml
6060
- ldap/values.yaml
6161
- overlays/ruka/values.yaml
62-
- name: ayekan
63-
clusterName: ayekan
64-
helm:
65-
valuesFiles:
66-
- pvc/values.yaml
67-
- aggregator/values.yaml
68-
- overlays/ayekan/values.yaml
6962
- name: antu
7063
clusterName: antu
7164
helm:

0 commit comments

Comments
 (0)