badjware
/
home-stack-kustomize
1
0
Fork 0
Code Releases Activity

Compare commits

base: badjware:f40ebdcb9681dbe5d1a38e95e9389718176cb594
Branches Tags
badjware:master
..
compare: badjware:d1fa3747c2a607a5c7e904aefa4fa2e2441eef3e
Branches Tags
badjware:master

No commits in common. "f40ebdcb9681dbe5d1a38e95e9389718176cb594" and "d1fa3747c2a607a5c7e904aefa4fa2e2441eef3e" have entirely different histories.
f40ebdcb96 ... d1fa3747c2

5 changed files with 5 additions and 23 deletions
Show Stats Expand all files Collapse all files

4
kustomize/bases/prometheus/kustomization.yaml
View File

@ -11,10 +11,6 @@ secretGenerator:
literals: literals:
- username=changeme - username=changeme
- password=changeme - password=changeme
- name: additional-scrape-configs
behavior: create
literals:
- prometheus-additional.yaml=
configurations: configurations:
- kustomizeconfig/namereference.yaml - kustomizeconfig/namereference.yaml

2
kustomize/bases/prometheus/kustomizeconfig/namereference.yaml
View File

@ -5,5 +5,3 @@ nameReference:
path: spec/remoteWrite/basicAuth/username/name path: spec/remoteWrite/basicAuth/username/name
- kind: Prometheus - kind: Prometheus
path: spec/remoteWrite/basicAuth/password/name path: spec/remoteWrite/basicAuth/password/name
- kind: Prometheus
path: spec/additionalScrapeConfigs/name

3
kustomize/bases/prometheus/prometheus.yaml
View File

@ -18,9 +18,6 @@ spec:
probeSelector: probeSelector:
matchLabels: matchLabels:
monitor: prometheus monitor: prometheus
additionalScrapeConfigs:
name: additional-scrape-configs
key: prometheus-additional.yaml
# remoteWrite: # remoteWrite:
# - url: changeme # - url: changeme
# basicAuth: # basicAuth:

3
kustomize/overlays/prod/configurations/prometheus/prometheus-additional.yaml
View File

@ -1,3 +0,0 @@
- job_name: additional/bastion-haproxy
static_configs:
- targets: ["192.168.20.10:8080"]

16
kustomize/overlays/prod/kustomization.yaml
View File

@ -1,4 +1,4 @@
resources: bases:
# - ../../namespaces/kubernetes-dashboard # - ../../namespaces/kubernetes-dashboard
- ../../namespaces/gitea - ../../namespaces/gitea
- ../../namespaces/grafana - ../../namespaces/grafana
@ -12,19 +12,19 @@ images:
- name: gitea/gitea - name: gitea/gitea
newTag: 1.16.9 newTag: 1.16.9
- name: grafana/grafana - name: grafana/grafana
newTag: 9.2.1 newTag: 9.0.4
# - name: prom/node-exporter # - name: prom/node-exporter
# newTag: v0.18.1 # newTag: v0.18.1
- name: prom/blackbox-exporter - name: prom/blackbox-exporter
newName: badjware/blackbox-exporter-tweak newName: badjware/blackbox-exporter-tweak
newTag: 0.21.1 newTag: 0.21.1
- name: drone/drone - name: drone/drone
newTag: 2.14.0 newTag: 2.7.0
- name: drone/drone-runner-kube - name: drone/drone-runner-kube
newTag: 1.0.0-rc.3 newTag: 1.0.0-rc.2
- name: nextcloud - name: nextcloud
newName: badjware/nextcloud-tweak newName: badjware/nextcloud-tweak
newTag: 24.0.6 newTag: 24.0.3
- name: postgres - name: postgres
newTag: 9.6.23 newTag: 9.6.23
- name: redis - name: redis
@ -78,12 +78,6 @@ secretGenerator:
# literals: # literals:
# - username=${ssm:/k3s/prod/monitoring/grafana-cloud/username} # - username=${ssm:/k3s/prod/monitoring/grafana-cloud/username}
# - password=${ssm:/k3s/prod/monitoring/grafana-cloud/password} # - password=${ssm:/k3s/prod/monitoring/grafana-cloud/password}
- name: additional-scrape-configs
type: Opaque
namespace: monitoring
behavior: replace
files:
- prometheus-additional.yaml=configurations/prometheus/prometheus-additional.yaml
# allow "kubectl apply -l managed-by=kustomize --prune ..." # allow "kubectl apply -l managed-by=kustomize --prune ..."
commonLabels: commonLabels: