From 2e39dec5b9160cf4bb43fd59b0a4f577bda246de Mon Sep 17 00:00:00 2001 From: Haitao Pan Date: Thu, 21 Dec 2023 23:48:31 +0800 Subject: [PATCH] update --- clusters/sit/fluxcd-metrics.yaml | 44 ------------------- clusters/sit/kustomization.yaml | 8 ---- ...ometheus-agent-configmap-patch-fluxcd.yaml | 25 ----------- 3 files changed, 77 deletions(-) delete mode 100644 clusters/sit/fluxcd-metrics.yaml delete mode 100644 clusters/sit/prometheus-agent-configmap-patch-fluxcd.yaml diff --git a/clusters/sit/fluxcd-metrics.yaml b/clusters/sit/fluxcd-metrics.yaml deleted file mode 100644 index b02e614..0000000 --- a/clusters/sit/fluxcd-metrics.yaml +++ /dev/null @@ -1,44 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: kustomize-controller-metrics - namespace: gitops-system - labels: - app: kustomize-controller -spec: - selector: - app: kustomize-controller - ports: - - protocol: TCP - port: 8080 - targetPort: 8080 ---- -apiVersion: v1 -kind: Service -metadata: - name: helm-controller-metrics - namespace: gitops-system - labels: - app: helm-controller -spec: - selector: - app: helm-controller - ports: - - protocol: TCP - port: 8080 - targetPort: 8080 ---- -apiVersion: v1 -kind: Service -metadata: - name: source-controller-metrics - namespace: gitops-system - labels: - app: source-controller -spec: - selector: - app: source-controller - ports: - - protocol: TCP - port: 8080 - targetPort: 8080 diff --git a/clusters/sit/kustomization.yaml b/clusters/sit/kustomization.yaml index 6ed69fa..14ea2ee 100644 --- a/clusters/sit/kustomization.yaml +++ b/clusters/sit/kustomization.yaml @@ -5,11 +5,3 @@ resources: - namespace.yaml - observability-agent.yaml - prometheus-agent-configmap.yaml -patchesStrategicMerge: - - prometheus-agent-configmap-patch-fluxcd.yaml ---- -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -namespace: gitops-system -resources: - - fluxcd-metrics.yaml diff --git a/clusters/sit/prometheus-agent-configmap-patch-fluxcd.yaml b/clusters/sit/prometheus-agent-configmap-patch-fluxcd.yaml deleted file mode 100644 index 8824677..0000000 --- a/clusters/sit/prometheus-agent-configmap-patch-fluxcd.yaml +++ /dev/null @@ -1,25 +0,0 @@ -apiVersion: v1 -data: - prometheus.yml: | - scrape_configs: - - job_name: 'fluxcd-controller-metrics' - targets: - - 'kustomize-controller-metrics:8080' - - 'helm-controller-metrics:8080' - - 'source-controller-metrics:8080' -kind: ConfigMap -metadata: - annotations: - meta.helm.sh/release-name: observabilityagent - meta.helm.sh/release-namespace: monitoring - labels: - app: prometheus - app.kubernetes.io/managed-by: Helm - chart: prometheus-18.4.0 - component: server - helm.toolkit.fluxcd.io/name: observabilityagent - helm.toolkit.fluxcd.io/namespace: monitoring - heritage: Helm - release: observabilityagent - name: observabilityagent-prometheus-server - namespace: monitoring