diff --git a/kubernetes/apps/flux-system/kustomization.yaml b/kubernetes/apps/flux-system/kustomization.yaml index 14967ade6..7d9d5fe83 100644 --- a/kubernetes/apps/flux-system/kustomization.yaml +++ b/kubernetes/apps/flux-system/kustomization.yaml @@ -7,5 +7,4 @@ resources: - ./namespace.yaml # Flux-Kustomizations - ./addons/ks.yaml - - ./weave-gitops/ks.yaml # Standard Resources diff --git a/kubernetes/apps/flux-system/weave-gitops/app/externalsecret.yaml b/kubernetes/apps/flux-system/weave-gitops/app/externalsecret.yaml deleted file mode 100644 index 28cbf9ea4..000000000 --- a/kubernetes/apps/flux-system/weave-gitops/app/externalsecret.yaml +++ /dev/null @@ -1,20 +0,0 @@ ---- -# yaml-language-server: $schema=https://kubernetes-schemas.devbu.io/external-secrets.io/externalsecret_v1beta1.json -apiVersion: external-secrets.io/v1beta1 -kind: ExternalSecret -metadata: - name: weave-gitops - namespace: flux-system -spec: - secretStoreRef: - kind: ClusterSecretStore - name: onepassword-connect - target: - name: weave-gitops-secret - template: - engineVersion: v2 - data: - adminPassword: "{{ .GITOPS_PASSWORD_BCRYPT }}" - dataFrom: - - extract: - key: weaveworks diff --git a/kubernetes/apps/flux-system/weave-gitops/app/helmrelease.yaml b/kubernetes/apps/flux-system/weave-gitops/app/helmrelease.yaml deleted file mode 100644 index f8d3d18b4..000000000 --- a/kubernetes/apps/flux-system/weave-gitops/app/helmrelease.yaml +++ /dev/null @@ -1,54 +0,0 @@ ---- -# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/helm.toolkit.fluxcd.io/helmrelease_v2beta2.json -apiVersion: helm.toolkit.fluxcd.io/v2beta2 -kind: HelmRelease -metadata: - name: weave-gitops - namespace: flux-system -spec: - interval: 30m - chart: - spec: - chart: weave-gitops - version: 4.0.36 - interval: 30m - sourceRef: - kind: HelmRepository - name: weaveworks - namespace: flux-system - maxHistory: 2 - install: - createNamespace: true - remediation: - retries: 3 - upgrade: - cleanupOnFail: true - remediation: - retries: 3 - uninstall: - keepHistory: false - values: - annotations: - secret.reloader.stakater.com/reload: &secret weave-gitops-secret - adminUser: - create: true - username: admin - # passwordHash: from valuesFrom - ingress: - enabled: true - className: nginx - annotations: - hajimari.io/icon: mdi:sawtooth-wave - hosts: - - host: &host "gitops.${SECRET_CLUSTER_DOMAIN}" - paths: - - path: / - pathType: Prefix - tls: - - hosts: - - *host - valuesFrom: - - kind: Secret - name: *secret - valuesKey: adminPassword - targetPath: adminUser.passwordHash diff --git a/kubernetes/apps/flux-system/weave-gitops/app/kustomization.yaml b/kubernetes/apps/flux-system/weave-gitops/app/kustomization.yaml deleted file mode 100644 index 85c1f0c98..000000000 --- a/kubernetes/apps/flux-system/weave-gitops/app/kustomization.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- -# 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: flux-system -resources: - - ./externalsecret.yaml - - ./helmrelease.yaml diff --git a/kubernetes/apps/flux-system/weave-gitops/ks.yaml b/kubernetes/apps/flux-system/weave-gitops/ks.yaml deleted file mode 100644 index 448fb229f..000000000 --- a/kubernetes/apps/flux-system/weave-gitops/ks.yaml +++ /dev/null @@ -1,26 +0,0 @@ ---- -# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/main/kustomization-kustomize-v1.json -apiVersion: kustomize.toolkit.fluxcd.io/v1 -kind: Kustomization -metadata: - name: &app weave-gitops - namespace: flux-system -spec: - targetNamespace: flux-system - commonMetadata: - labels: - app.kubernetes.io/name: *app - path: ./kubernetes/apps/flux-system/weave-gitops/app - prune: true - sourceRef: - kind: GitRepository - name: home-ops-kubernetes - dependsOn: - - name: external-secrets-stores - wait: false - interval: 30m - retryInterval: 1m - timeout: 5m - postBuild: - substitute: - APP: *app diff --git a/kubernetes/apps/monitoring/kube-prometheus-stack/app/helmrelease.yaml b/kubernetes/apps/monitoring/kube-prometheus-stack/app/helmrelease.yaml index 75b060c2f..15f4f2996 100644 --- a/kubernetes/apps/monitoring/kube-prometheus-stack/app/helmrelease.yaml +++ b/kubernetes/apps/monitoring/kube-prometheus-stack/app/helmrelease.yaml @@ -165,7 +165,7 @@ spec: scrape_interval: 60s metrics_path: "/metrics" static_configs: - - targets: ["192.168.9.10:9273"] + - targets: ["${LOCAL_LAN_TRUENAS}:9273"] labels: app: "truenas" - job_name: "truenas-remote"