Compare commits
No commits in common. "c2c5aff42f4bc9020b4b53e4ece6d5022cf465e4" and "5e30ff4c2adc4796676044a39923247a2ad3ed27" have entirely different histories.
c2c5aff42f
...
5e30ff4c2a
|
@ -36,8 +36,6 @@ spec:
|
|||
value: repo.wiki
|
||||
- name: GITEA__REPOSITORY__DEFAULT_REPO_UNITS
|
||||
value: repo.code,repo.releases
|
||||
- name: GITEA__WEBHOOK_ALLOWED_HOST_LIST
|
||||
value: ${DRONE_EXTERNAL_HOST}
|
||||
ports:
|
||||
- name: http
|
||||
containerPort: 3000
|
||||
|
|
|
@ -0,0 +1,10 @@
|
|||
apiVersion: v1
|
||||
kind: PersistentVolumeClaim
|
||||
metadata:
|
||||
name: grafana-agent-wal-pvc
|
||||
spec:
|
||||
accessModes:
|
||||
- ReadWriteOnce
|
||||
resources:
|
||||
requests:
|
||||
storage: 1Gi
|
|
@ -1,5 +1,6 @@
|
|||
resources:
|
||||
- https://raw.githubusercontent.com/grafana/agent/v0.24.2/production/kubernetes/agent-bare.yaml
|
||||
- grafana-agent-volume.yaml
|
||||
|
||||
secretGenerator:
|
||||
- name: grafana-agent
|
||||
|
|
|
@ -29,13 +29,12 @@ spec:
|
|||
env:
|
||||
- name: GF_SERVER_DOMAIN
|
||||
value: ${GRAFANA_EXTERNAL_HOST}
|
||||
- name: GF_SERVER_ROOT_URL
|
||||
value: https://${GRAFANA_EXTERNAL_HOST}/
|
||||
# - name: GF_AUTH_ANONYMOUS_ENABLED
|
||||
# value: "true"
|
||||
- name: GF_INSTALL_PLUGINS
|
||||
value: marcusolsson-json-datasource,marcusolsson-treemap-panel
|
||||
args: ['--config', '/etc/grafana/provisioning/config/custom.ini']
|
||||
- name: GF_FEATURE_TOGGLES_ENABLE
|
||||
value: ngalert
|
||||
readinessProbe:
|
||||
failureThreshold: 3
|
||||
httpGet:
|
||||
|
@ -67,17 +66,12 @@ spec:
|
|||
volumeMounts:
|
||||
- name: grafana-datasources
|
||||
mountPath: /etc/grafana/provisioning/datasources
|
||||
- name: grafana-config
|
||||
mountPath: /etc/grafana/provisioning/config
|
||||
- mountPath: /var/lib/grafana
|
||||
name: grafana-pv
|
||||
volumes:
|
||||
- name: grafana-datasources
|
||||
configMap:
|
||||
name: grafana-datasources
|
||||
- name: grafana-config
|
||||
secret:
|
||||
secretName: grafana-config
|
||||
- name: grafana-pv
|
||||
persistentVolumeClaim:
|
||||
claimName: grafana-pvc
|
||||
|
|
|
@ -7,12 +7,6 @@ configMapGenerator:
|
|||
files:
|
||||
- datasources.yaml=provision/datasources.yaml
|
||||
|
||||
secretGenerator:
|
||||
- name: grafana-config
|
||||
type: Opaque
|
||||
literals:
|
||||
- custom.ini=
|
||||
|
||||
# secretGenerator:
|
||||
# - name: postgres-credentials
|
||||
# type: Opaque
|
||||
|
|
|
@ -6,7 +6,7 @@ metadata:
|
|||
spec:
|
||||
repo: https://charts.longhorn.io
|
||||
chart: longhorn
|
||||
version: 1.3.0
|
||||
version: 1.2.4
|
||||
targetNamespace: longhorn-system
|
||||
set:
|
||||
backupTargetCredentialSecret: s3-backupstore-credentials
|
||||
|
@ -15,7 +15,7 @@ spec:
|
|||
backupTarget: s3://longhorn-backups@home/
|
||||
defaultReplicaCount: 2
|
||||
defaultDataLocality: best-effort
|
||||
replicaAutoBalance: least-effort
|
||||
replicaAutoBalance: best-effort
|
||||
taintToleration: "kubernetes.io/arch:"
|
||||
longhornManager:
|
||||
tolerations:
|
||||
|
|
|
@ -7,6 +7,6 @@ spec:
|
|||
cron: "0 8 * * 2"
|
||||
task: "backup"
|
||||
groups:
|
||||
- backup
|
||||
- default
|
||||
retain: 2
|
||||
concurrency: 1
|
|
@ -30,10 +30,6 @@ spec:
|
|||
operator: In
|
||||
values:
|
||||
- amd64
|
||||
tolerations:
|
||||
- key: kubernetes.io/arch
|
||||
operator: Equal
|
||||
value: amd64
|
||||
containers:
|
||||
- name: nextcloud
|
||||
image: nextcloud
|
||||
|
|
|
@ -1,9 +0,0 @@
|
|||
[auth.generic_oauth]
|
||||
enabled = true
|
||||
allow_sign_up = false
|
||||
client_id = 5yCpX9YovdrEuBpy69438S8GzCUJZLxqFl4rOcIpjBHICRpJzjv56VMxslKj7iqm
|
||||
client_secret = ${ssm:/k3s/prod/nextcloud/oidc/grafana/client_secret}
|
||||
scopes = openid profile email
|
||||
auth_url = https://cloud.badjware.dev/apps/oidc/authorize
|
||||
token_url = https://cloud.badjware.dev/apps/oidc/token
|
||||
api_url = https://cloud.badjware.dev/apps/oidc/userinfo
|
|
@ -5,31 +5,33 @@ bases:
|
|||
- ../../namespaces/monitoring
|
||||
- ../../namespaces/nextcloud
|
||||
|
||||
# resources:
|
||||
# - probes/external-services-bobcat-miner.yaml
|
||||
resources:
|
||||
- probes/external-services-bobcat-miner.yaml
|
||||
|
||||
images:
|
||||
- name: gitea/gitea
|
||||
newTag: 1.16.9
|
||||
newTag: 1.15.7
|
||||
- name: grafana/grafana
|
||||
newTag: 9.0.4
|
||||
# - name: prom/node-exporter
|
||||
# newTag: v0.18.1
|
||||
newTag: 8.5.3
|
||||
- name: prom/node-exporter
|
||||
newTag: v0.18.1
|
||||
- name: prom/blackbox-exporter
|
||||
newName: badjware/blackbox-exporter-tweak
|
||||
newTag: 0.21.1
|
||||
newTag: 0.19.0-1
|
||||
- name: drone/drone
|
||||
newTag: 2.7.0
|
||||
- name: drone/drone-runner-kube
|
||||
newTag: 1.0.0-rc.2
|
||||
- name: nextcloud
|
||||
newName: badjware/nextcloud-tweak
|
||||
newTag: 24.0.3
|
||||
newTag: 22.2.3-3
|
||||
- name: postgres
|
||||
newTag: 9.6.23
|
||||
- name: redis
|
||||
newTag: 6.2.5
|
||||
|
||||
configMapGenerator: []
|
||||
|
||||
secretGenerator:
|
||||
- name: drone-secret
|
||||
type: Opaque
|
||||
|
@ -65,12 +67,6 @@ secretGenerator:
|
|||
behavior: replace
|
||||
files:
|
||||
- agent.yaml=configurations/grafana-agent/agent.yaml
|
||||
- name: grafana-config
|
||||
type: Opaque
|
||||
namespace: grafana
|
||||
behavior: replace
|
||||
files:
|
||||
- custom.ini=configurations/grafana/custom.ini
|
||||
# - name: grafana-cloud-credentials
|
||||
# type: Opaque
|
||||
# namespace: monitoring
|
||||
|
|
Loading…
Reference in New Issue