Skip to content

Commit

Permalink
Revert "chore(flux): settings are optional now"
Browse files Browse the repository at this point in the history
This reverts commit 88e5848.
  • Loading branch information
buroa committed Jan 10, 2025
1 parent 613e6f0 commit 028a018
Show file tree
Hide file tree
Showing 24 changed files with 33 additions and 24 deletions.
2 changes: 1 addition & 1 deletion kubernetes/apps/home/atuin/app/helmrelease.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ spec:
ATUIN_METRICS__ENABLE: true
ATUIN_METRICS__HOST: 0.0.0.0
ATUIN_METRICS__PORT: &metricsPort 8081
TZ: America/Chicago
TZ: ${TIMEZONE}
envFrom: *envFrom
args:
- server
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/apps/home/home-assistant/app/helmrelease.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ spec:
HOME_ASSISTANT_PURGE_KEEP_DAYS: 30
HOME_ASSISTANT_TRUSTED_PROXIES: 10.244.0.0/16
HOME_ASSISTANT_UNIT_SYSTEM: imperial
TZ: America/Chicago
TZ: ${TIMEZONE}
envFrom:
- secretRef:
name: home-assistant-secret
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/apps/home/zigbee2mqtt/app/helmrelease.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ spec:
repository: ghcr.io/koenkk/zigbee2mqtt
tag: 2.0.0@sha256:6105a3a01a66bbfb98909a7c309d0707ec7b41728ac15d399747077225231545
env:
TZ: America/Chicago
TZ: ${TIMEZONE}
ZIGBEE2MQTT_DATA: /config
ZIGBEE2MQTT_CONFIG_ADVANCED_LAST_SEEN: ISO_8601
ZIGBEE2MQTT_CONFIG_ADVANCED_LOG_LEVEL: info # debug
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/apps/kube-system/fstrim/app/helmrelease.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ spec:
type: cronjob
cronjob:
schedule: 0 0 * * 1
timeZone: America/Chicago
timeZone: ${TIMEZONE}
parallelism: 3 # Set to my total number of nodes
successfulJobsHistory: 1
failedJobsHistory: 1
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/apps/media/autobrr/app/helmrelease.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ spec:
AUTOBRR__HOST: 0.0.0.0
AUTOBRR__PORT: &port 7474
AUTOBRR__LOG_LEVEL: INFO
TZ: America/Chicago
TZ: ${TIMEZONE}
envFrom: *envFrom
probes:
liveness: &probes
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/apps/media/bazarr/app/helmrelease.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ spec:
tag: 1.5.1@sha256:bd7187f0fad40eef4136ae30591dc47417998e90a4b88971b78d72bfab772885
env:
BAZARR__PORT: &port 6767
TZ: America/Chicago
TZ: ${TIMEZONE}
envFrom:
- secretRef:
name: bazarr-secret
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/apps/media/cross-seed/app/helmrelease.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ spec:
- daemon
env:
CROSS_SEED_PORT: &port 2468
TZ: America/Chicago
TZ: ${TIMEZONE}
envFrom:
- secretRef:
name: cross-seed-secret
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/apps/media/overseerr/app/helmrelease.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ spec:
env:
LOG_LEVEL: info
PORT: &port 5055
TZ: America/Chicago
TZ: ${TIMEZONE}
probes:
liveness: &probes
enabled: true
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/apps/media/plex/app/helmrelease.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ spec:
env:
PLEX_ADVERTISE_URL: https://{{ .Release.Name }}.ktwo.io:443
PLEX_NO_AUTH_NETWORKS: 192.168.1.0/24
TZ: America/Chicago
TZ: ${TIMEZONE}
probes:
liveness: &probes
enabled: true
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/apps/media/prowlarr/app/helmrelease.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ spec:
PROWLARR__LOG__LEVEL: info
PROWLARR__SERVER__PORT: &port 9696
PROWLARR__UPDATE__BRANCH: develop
TZ: America/Chicago
TZ: ${TIMEZONE}
envFrom: *envFrom
probes:
liveness: &probes
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/apps/media/qbittorrent/app/helmrelease.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ spec:
env:
QBT_TORRENTING_PORT: &bittorrentPort 50413
QBT_WEBUI_PORT: &port 8080
TZ: America/Chicago
TZ: ${TIMEZONE}
probes:
liveness: &probes
enabled: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ spec:
type: cronjob
cronjob:
schedule: "@hourly"
timeZone: &timeZone America/Chicago
timeZone: &timeZone ${TIMEZONE}
concurrencyPolicy: Forbid
successfulJobsHistory: 1
failedJobsHistory: 1
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/apps/media/radarr/app/helmrelease.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ spec:
RADARR__LOG__LEVEL: info
RADARR__SERVER__PORT: &port 7878
RADARR__UPDATE__BRANCH: develop
TZ: America/Chicago
TZ: ${TIMEZONE}
envFrom: *envFrom
probes:
liveness: &probes
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/apps/media/recyclarr/app/helmrelease.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ spec:
type: cronjob
cronjob:
schedule: "@daily"
timeZone: &timeZone America/Chicago
timeZone: &timeZone ${TIMEZONE}
concurrencyPolicy: Forbid
successfulJobsHistory: 1
failedJobsHistory: 1
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/apps/media/sabnzbd/app/helmrelease.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ spec:
sabnzbd.media.svc.cluster.local,
{{ .Release.Name }}.ktwo.io,
sab.ktwo.io
TZ: America/Chicago
TZ: ${TIMEZONE}
envFrom:
- secretRef:
name: sabnzbd-secret
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/apps/media/sonarr/app/helmrelease.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ spec:
SONARR__LOG__LEVEL: info
SONARR__SERVER__PORT: &port 8989
SONARR__UPDATE__BRANCH: develop
TZ: America/Chicago
TZ: ${TIMEZONE}
envFrom: *envFrom
probes:
liveness: &probes
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/apps/media/tautulli/app/helmrelease.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ spec:
tag: 2.15.0@sha256:fa63a01dae9f11578d585b7b704b0e4474ddf783f5d7b55423de8a671a76bbda
env:
TAUTULLI__PORT: &port 8181
TZ: America/Chicago
TZ: ${TIMEZONE}
probes:
liveness: &probes
enabled: true
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/apps/media/unpackerr/app/helmrelease.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ spec:
repository: ghcr.io/unpackerr/unpackerr
tag: 0.14.5@sha256:dc72256942ce50d1c8a1aeb5aa85b6ae2680a36eefd2182129d8d210fce78044
env:
TZ: America/Chicago
TZ: ${TIMEZONE}
UN_WEBSERVER_METRICS: true
UN_WEBSERVER_LOG_FILE: /logs/webserver.log
UN_ACTIVITY: true
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/apps/monitoring/gatus/app/helmrelease.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ spec:
GATUS_WEB_PORT: &port 80
GATUS_CONFIG_PATH: /config
GATUS_DELAY_START_SECONDS: 5
TZ: America/Chicago
TZ: ${TIMEZONE}
envFrom: *envFrom
probes:
liveness: &probes
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ spec:
type: cronjob
cronjob:
schedule: "@daily"
timeZone: America/Chicago
timeZone: ${TIMEZONE}
concurrencyPolicy: Forbid
successfulJobsHistory: 1
failedJobsHistory: 1
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/apps/monitoring/unpoller/app/helmrelease.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ spec:
repository: ghcr.io/unpoller/unpoller
tag: v2.13.1@sha256:2376aff5e18b8f9fdd618becc2ef668ce31deb4c0e74acc5bea88e6c20c23a39
env:
TZ: America/Chicago
TZ: ${TIMEZONE}
UP_UNIFI_DEFAULT_ROLE: k8s-gitops
UP_UNIFI_DEFAULT_URL: https://unifi.internal
UP_UNIFI_DEFAULT_VERIFY_SSL: false
Expand Down
4 changes: 2 additions & 2 deletions kubernetes/flux/config/cluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ spec:
substituteFrom:
- kind: ConfigMap
name: cluster-settings
optional: true
optional: false
- kind: Secret
name: cluster-secrets
optional: true
Expand All @@ -77,7 +77,7 @@ spec:
substituteFrom:
- kind: ConfigMap
name: cluster-settings
optional: true
optional: false
- kind: Secret
name: cluster-secrets
optional: true
Expand Down
8 changes: 8 additions & 0 deletions kubernetes/flux/settings/cluster-settings.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
apiVersion: v1
kind: ConfigMap
metadata:
name: cluster-settings
namespace: flux-system
data:
TIMEZONE: America/Chicago
3 changes: 2 additions & 1 deletion kubernetes/flux/settings/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
---
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources: []
resources:
- ./cluster-settings.yaml

0 comments on commit 028a018

Please sign in to comment.