From dea11cb02dfe7585577541953a2494e12684b426 Mon Sep 17 00:00:00 2001 From: Edward Cheng Date: Wed, 12 Jun 2024 16:27:47 +1000 Subject: [PATCH 1/2] update repo interval to 6h --- kubernetes/infrastructure/repositories/repos/bitnami.yaml | 2 +- kubernetes/infrastructure/repositories/repos/bjw-s.yaml | 2 +- kubernetes/infrastructure/repositories/repos/external-dns.yaml | 2 +- kubernetes/infrastructure/repositories/repos/gabe565.yaml | 2 +- .../repositories/repos/home-cluster-ops-secrets.yaml | 2 +- .../infrastructure/repositories/repos/prometheus-community.yaml | 2 +- kubernetes/infrastructure/repositories/repos/truecharts.yaml | 2 +- kubernetes/infrastructure/repositories/repositories.yaml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/kubernetes/infrastructure/repositories/repos/bitnami.yaml b/kubernetes/infrastructure/repositories/repos/bitnami.yaml index 3a3cda7..f19c1e9 100644 --- a/kubernetes/infrastructure/repositories/repos/bitnami.yaml +++ b/kubernetes/infrastructure/repositories/repos/bitnami.yaml @@ -4,6 +4,6 @@ metadata: name: bitnami namespace: flux-system spec: - interval: 1h + interval: 6h type: oci url: oci://registry-1.docker.io/bitnamicharts diff --git a/kubernetes/infrastructure/repositories/repos/bjw-s.yaml b/kubernetes/infrastructure/repositories/repos/bjw-s.yaml index 00ff034..e12ca7d 100644 --- a/kubernetes/infrastructure/repositories/repos/bjw-s.yaml +++ b/kubernetes/infrastructure/repositories/repos/bjw-s.yaml @@ -4,6 +4,6 @@ metadata: name: bjw-s namespace: flux-system spec: - interval: 1h + interval: 6h type: oci url: oci://ghcr.io/bjw-s/helm diff --git a/kubernetes/infrastructure/repositories/repos/external-dns.yaml b/kubernetes/infrastructure/repositories/repos/external-dns.yaml index d211bb7..894c118 100644 --- a/kubernetes/infrastructure/repositories/repos/external-dns.yaml +++ b/kubernetes/infrastructure/repositories/repos/external-dns.yaml @@ -4,5 +4,5 @@ metadata: name: external-dns namespace: flux-system spec: - interval: 1h + interval: 6h url: https://kubernetes-sigs.github.io/external-dns/ diff --git a/kubernetes/infrastructure/repositories/repos/gabe565.yaml b/kubernetes/infrastructure/repositories/repos/gabe565.yaml index c3ce81a..335eb91 100644 --- a/kubernetes/infrastructure/repositories/repos/gabe565.yaml +++ b/kubernetes/infrastructure/repositories/repos/gabe565.yaml @@ -4,6 +4,6 @@ metadata: name: gabe565 namespace: flux-system spec: - interval: 1h + interval: 6h type: oci url: oci://ghcr.io/gabe565/charts diff --git a/kubernetes/infrastructure/repositories/repos/home-cluster-ops-secrets.yaml b/kubernetes/infrastructure/repositories/repos/home-cluster-ops-secrets.yaml index 7591dc6..d0167f1 100644 --- a/kubernetes/infrastructure/repositories/repos/home-cluster-ops-secrets.yaml +++ b/kubernetes/infrastructure/repositories/repos/home-cluster-ops-secrets.yaml @@ -4,7 +4,7 @@ metadata: name: home-cluster-ops-secrets namespace: flux-system spec: - interval: 5m0s + interval: 6h ref: branch: main secretRef: diff --git a/kubernetes/infrastructure/repositories/repos/prometheus-community.yaml b/kubernetes/infrastructure/repositories/repos/prometheus-community.yaml index e6c9333..fed4aee 100644 --- a/kubernetes/infrastructure/repositories/repos/prometheus-community.yaml +++ b/kubernetes/infrastructure/repositories/repos/prometheus-community.yaml @@ -4,5 +4,5 @@ metadata: name: prometheus-community namespace: flux-system spec: - interval: 1h + interval: 6h url: https://prometheus-community.github.io/helm-charts diff --git a/kubernetes/infrastructure/repositories/repos/truecharts.yaml b/kubernetes/infrastructure/repositories/repos/truecharts.yaml index aaa4f33..8f1e62f 100644 --- a/kubernetes/infrastructure/repositories/repos/truecharts.yaml +++ b/kubernetes/infrastructure/repositories/repos/truecharts.yaml @@ -4,6 +4,6 @@ metadata: name: truecharts namespace: flux-system spec: - interval: 1h + interval: 6h type: oci url: oci://tccr.io/truecharts \ No newline at end of file diff --git a/kubernetes/infrastructure/repositories/repositories.yaml b/kubernetes/infrastructure/repositories/repositories.yaml index d80562f..f175ba8 100644 --- a/kubernetes/infrastructure/repositories/repositories.yaml +++ b/kubernetes/infrastructure/repositories/repositories.yaml @@ -5,7 +5,7 @@ metadata: name: repositories namespace: flux-system spec: - interval: 5m + interval: 6h path: ./kubernetes/infrastructure/repositories/repos prune: true sourceRef: From b5a8be2ead04c8063670f5f15a35ad7e25a9d0dd Mon Sep 17 00:00:00 2001 From: Edward Cheng Date: Wed, 12 Jun 2024 16:36:43 +1000 Subject: [PATCH 2/2] add app prometheus-operator --- .../prometheus-operator/kustomization.yaml | 4 ++ .../prometheus-operator.yaml | 14 +++++ .../apps/prometheus-operator/release.yaml | 59 +++++++++++++++++++ 3 files changed, 77 insertions(+) create mode 100644 kubernetes/apps/prometheus-operator/kustomization.yaml create mode 100644 kubernetes/apps/prometheus-operator/prometheus-operator.yaml create mode 100644 kubernetes/apps/prometheus-operator/release.yaml diff --git a/kubernetes/apps/prometheus-operator/kustomization.yaml b/kubernetes/apps/prometheus-operator/kustomization.yaml new file mode 100644 index 0000000..0509800 --- /dev/null +++ b/kubernetes/apps/prometheus-operator/kustomization.yaml @@ -0,0 +1,4 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - prometheus-operator.yaml diff --git a/kubernetes/apps/prometheus-operator/prometheus-operator.yaml b/kubernetes/apps/prometheus-operator/prometheus-operator.yaml new file mode 100644 index 0000000..b8e485b --- /dev/null +++ b/kubernetes/apps/prometheus-operator/prometheus-operator.yaml @@ -0,0 +1,14 @@ +apiVersion: kustomize.toolkit.fluxcd.io/v1 +kind: Kustomization +metadata: + name: prometheus-operator + namespace: flux-system +spec: + interval: 1h + targetNamespace: cert-manager + path: ./kubernetes/templates/apps/prometheus-operator + prune: true + sourceRef: + kind: GitRepository + namespace: flux-system + name: flux-system \ No newline at end of file diff --git a/kubernetes/apps/prometheus-operator/release.yaml b/kubernetes/apps/prometheus-operator/release.yaml new file mode 100644 index 0000000..053ba45 --- /dev/null +++ b/kubernetes/apps/prometheus-operator/release.yaml @@ -0,0 +1,59 @@ +apiVersion: helm.toolkit.fluxcd.io/v2 +kind: HelmRelease +metadata: + name: prometheus-operator + namespace: prometheus-operator +spec: + releaseName: prometheus-operator + chart: + spec: + chart: prometheus-operator + sourceRef: + kind: HelmRepository + name: truecharts + namespace: flux-system + interval: 5m + install: + remediation: + retries: 3 + values: + service: + main: + enabled: true + ports: + main: + enabled: true + + workload: + main: + enabled: true + + portal: + open: + enabled: true + + operator: + register: true + + kps: + ## Install Prometheus Operator CRDs + ## + crds: + enabled: true + + ## Manages Prometheus and Alertmanager components + ## + prometheusOperator: + enabled: true + + #### + ## + ## Everything down here, explicitly disables everything BUT the operator itself + ## + #### + + + ## dont Deploy a Prometheus instance + ## + prometheus: + enabled: true \ No newline at end of file