From e2b7e7f17d5925b90e177a4917915e42d9645847 Mon Sep 17 00:00:00 2001
From: karancode <karan.thanvi@paypay-corp.co.jp>
Date: Tue, 22 Oct 2019 20:58:05 +0900
Subject: [PATCH] remove yamls from general mamnifests
---
jsonnetfile.lock.json | 2 +-
kustomization.yaml | 2 --
.../prometheus-AwsEksCniMetricService.yaml | 15 ---------------
.../prometheus-serviceMonitorAwsEksCNI.yaml | 19 -------------------
4 files changed, 1 insertion(+), 37 deletions(-)
delete mode 100644 manifests/prometheus-AwsEksCniMetricService.yaml
delete mode 100644 manifests/prometheus-serviceMonitorAwsEksCNI.yaml
diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
index 7e4bf047..0282336c 100644
--- a/jsonnetfile.lock.json
+++ b/jsonnetfile.lock.json
@@ -7,7 +7,7 @@
"directory": "jsonnet/kube-prometheus"
}
},
- "version": "aws_eks_cni"
+ "version": ""
},
{
"name": "ksonnet",
diff --git a/kustomization.yaml b/kustomization.yaml
index d8ecbcb6..a580ed8e 100644
--- a/kustomization.yaml
+++ b/kustomization.yaml
@@ -39,7 +39,6 @@ resources:
- ./manifests/node-exporter-service.yaml
- ./manifests/node-exporter-serviceAccount.yaml
- ./manifests/node-exporter-serviceMonitor.yaml
-- ./manifests/prometheus-AwsEksCniMetricService.yaml
- ./manifests/prometheus-adapter-apiService.yaml
- ./manifests/prometheus-adapter-clusterRole.yaml
- ./manifests/prometheus-adapter-clusterRoleAggregatedMetricsReader.yaml
@@ -63,7 +62,6 @@ resources:
- ./manifests/prometheus-serviceAccount.yaml
- ./manifests/prometheus-serviceMonitor.yaml
- ./manifests/prometheus-serviceMonitorApiserver.yaml
-- ./manifests/prometheus-serviceMonitorAwsEksCNI.yaml
- ./manifests/prometheus-serviceMonitorCoreDNS.yaml
- ./manifests/prometheus-serviceMonitorKubeControllerManager.yaml
- ./manifests/prometheus-serviceMonitorKubeScheduler.yaml
diff --git a/manifests/prometheus-AwsEksCniMetricService.yaml b/manifests/prometheus-AwsEksCniMetricService.yaml
deleted file mode 100644
index 4e3ee1dd..00000000
--- a/manifests/prometheus-AwsEksCniMetricService.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
- labels:
- k8s-app: aws-node
- name: aws-node
- namespace: kube-system
-spec:
- clusterIP: None
- ports:
- - name: cni-metrics-port
- port: 61678
- targetPort: 61678
- selector:
- k8s-app: aws-node
diff --git a/manifests/prometheus-serviceMonitorAwsEksCNI.yaml b/manifests/prometheus-serviceMonitorAwsEksCNI.yaml
deleted file mode 100644
index bcb9d1e9..00000000
--- a/manifests/prometheus-serviceMonitorAwsEksCNI.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
- labels:
- k8s-app: eks-cni
- name: awsekscni
- namespace: monitoring
-spec:
- endpoints:
- - interval: 30s
- path: /metrics
- port: cni-metrics-port
- jobLabel: k8s-app
- namespaceSelector:
- matchNames:
- - kube-system
- selector:
- matchLabels:
- k8s-app: aws-node
--
GitLab