🚑 fix weaveworks gitops

This commit is contained in:
auricom
2023-09-14 18:53:43 +02:00
parent d692ce456f
commit 2bdc0a928d
11 changed files with 42 additions and 52 deletions

View File

@@ -1,14 +1,13 @@
---
# yaml-language-server: $schema=https://raw.githubusercontent.com/SchemaStore/schemastore/master/src/schemas/json/kustomization.json
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
namespace: default
resources:
- ./externalsecret.yaml
- ./gatus.yaml
- ./helmrelease.yaml
- ./podmonitor.yaml
- ./volsync.yaml
- ./volume.yaml
patchesStrategicMerge:
- ./patches/addons.yaml
- ./externalsecret.yaml
- ./gatus.yaml
- ./helmrelease.yaml
- ./podmonitor.yaml
- ./volsync.yaml
- ./volume.yaml
patches:
- path: ./patches/addons.yaml

View File

@@ -1,13 +1,12 @@
---
# yaml-language-server: $schema=https://raw.githubusercontent.com/SchemaStore/schemastore/master/src/schemas/json/kustomization.json
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
namespace: default
resources:
- ./gatus.yaml
- ./helmrelease.yaml
- ./prometheusrule.yaml
- ./volsync.yaml
- ./volume.yaml
patchesStrategicMerge:
- ./patches/exporter.yaml
- ./gatus.yaml
- ./helmrelease.yaml
- ./prometheusrule.yaml
- ./volsync.yaml
- ./volume.yaml
patches:
- path: ./patches/exporter.yaml

View File

@@ -2,19 +2,19 @@
apiVersion: external-secrets.io/v1beta1
kind: ExternalSecret
metadata:
name: flux
name: github-token
namespace: flux-system
spec:
secretStoreRef:
kind: ClusterSecretStore
name: onepassword-connect
target:
name: github-notification-token
name: github-token-secret
creationPolicy: Owner
template:
engineVersion: v2
data:
token: '{{ .GITHUB_NOTIFICATION_WEBHOOK_TOKEN }}'
token: '{{ .GITHUB_NOTIFICATION_TOKEN }}'
dataFrom:
- extract:
key: weaveworks

View File

@@ -1,6 +1,6 @@
---
# yaml-language-server: $schema=https://kubernetes-schemas.devbu.io/provider_v1beta2.json
apiVersion: notification.toolkit.fluxcd.io/v1beta1
apiVersion: notification.toolkit.fluxcd.io/v1beta2
kind: Provider
metadata:
name: github
@@ -9,10 +9,10 @@ spec:
type: github
address: https://github.com/auricom/home-ops
secretRef:
name: github-notification-token
name: github-token-secret
---
# yaml-language-server: $schema=https://kubernetes-schemas.devbu.io/alert_v1beta2.json
apiVersion: notification.toolkit.fluxcd.io/v1beta1
apiVersion: notification.toolkit.fluxcd.io/v1beta2
kind: Alert
metadata:
name: github

View File

@@ -3,14 +3,14 @@
apiVersion: external-secrets.io/v1beta1
kind: ExternalSecret
metadata:
name: flux
name: github-webhook-token
namespace: flux-system
spec:
secretStoreRef:
kind: ClusterSecretStore
name: onepassword-connect
target:
name: flux-github-webhook-secret
name: github-webhook-token-secret
creationPolicy: Owner
template:
engineVersion: v2

View File

@@ -11,9 +11,9 @@ spec:
- ping
- push
secretRef:
name: flux-github-webhook-secret
name: github-webhook-token-secret
resources:
- apiVersion: source.toolkit.fluxcd.io/v1beta2
- apiVersion: source.toolkit.fluxcd.io/v1
kind: GitRepository
name: home-ops-kubernetes
namespace: flux-system
@@ -21,14 +21,6 @@ spec:
kind: Kustomization
name: apps
namespace: flux-system
- apiVersion: kustomize.toolkit.fluxcd.io/v1
kind: Kustomization
name: core
namespace: flux-system
- apiVersion: kustomize.toolkit.fluxcd.io/v1
kind: Kustomization
name: base
namespace: flux-system
- apiVersion: kustomize.toolkit.fluxcd.io/v1
kind: Kustomization
name: flux-cluster

View File

@@ -15,7 +15,7 @@ spec:
template:
engineVersion: v2
data:
adminPassword: "{{ .password }}"
adminPassword: "{{ .GITOPS_PASSWORD_BCRYPT }}"
dataFrom:
- extract:
key: weaveworks

View File

@@ -28,6 +28,8 @@ spec:
uninstall:
keepHistory: false
values:
annotations:
secret.reloader.stakater.com/reload: &secret weave-gitops-secret
adminUser:
create: true
username: admin
@@ -47,6 +49,6 @@ spec:
- *host
valuesFrom:
- kind: Secret
name: weave-gitops-secret
name: *secret
valuesKey: adminPassword
targetPath: adminUser.passwordHash

View File

@@ -1,16 +1,15 @@
---
# yaml-language-server: $schema=https://raw.githubusercontent.com/SchemaStore/schemastore/master/src/schemas/json/kustomization.json
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
namespace: monitoring
resources:
- ./secret.sops.yaml
- ./helmrelease.yaml
patchesStrategicMerge:
- ./patches/geoip.yaml
- ./secret.sops.yaml
- ./helmrelease.yaml
configMapGenerator:
- name: vector-aggregator-configmap
files:
- vector.yaml=./config/vector.yaml
- files:
- vector.yaml=./config/vector.yaml
name: vector-aggregator-configmap
generatorOptions:
disableNameSuffixHash: true
patches:
- path: ./patches/geoip.yaml

View File

@@ -178,7 +178,7 @@ spec:
valuesKey: GITEA_AWS_S3_SECRET_KEY
postRenderers:
- kustomize:
patchesStrategicMerge:
patches:
- kind: Deployment
apiVersion: apps/v1
metadata:

View File

@@ -1,11 +1,10 @@
---
# yaml-language-server: $schema=https://raw.githubusercontent.com/SchemaStore/schemastore/master/src/schemas/json/kustomization.json
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
namespace: default
resources:
- ./externalbackup.yaml
- ./externalsecret.yaml
- ./helmrelease.yaml
- ./volsync.yaml
- ./volume.yaml
- ./externalbackup.yaml
- ./externalsecret.yaml
- ./helmrelease.yaml
- ./volsync.yaml
- ./volume.yaml