diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json index 7e4bf0479382be7ec03f2dcf5f2a712cc6aadede..0282336c7296e39b54196ea03ce4cb317cfdd807 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 d8ecbcb69f309b961fbfeb3c9b3dafab19097e35..a580ed8e6602627dd362095bc07356b0dc55d801 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 4e3ee1dddd1dee435d656979591ea611f6e8b04d..0000000000000000000000000000000000000000 --- 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 bcb9d1e9f55614fbdcd33144a893b53bbf2216ff..0000000000000000000000000000000000000000 --- 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