Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(kps): Remove duplicate apiserver / unused keepalived target (2.5) #1492

Merged
merged 3 commits into from
Aug 17, 2023
Merged

fix(kps): Remove duplicate apiserver / unused keepalived target (2.5) #1492

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
85a4e16
fix(kps): Remove duplicate apiserver and unused keepalived scrapeconf…
gracedo Aug 16, 2023
60fb921
ci: Validate PR title length instead of commit (#1433)
gracedo Jul 27, 2023
26ecf53
ci(gitlint): Increase body-max-line-length
gracedo Aug 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion .github/workflows/lint-pr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
name: "Lint PR"

on:
pull_request_target:
pull_request:
types:
- opened
- edited
- synchronize
- reopened

jobs:
main:
Expand All @@ -15,3 +16,8 @@ jobs:
- uses: amannn/action-semantic-pull-request@v4
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- uses: deepakputhraya/action-pr-title@master
with:
max_length: 72 # Max length of PR title
github_token: ${{ secrets.GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion .gitlint
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[general]
contrib=contrib-title-conventional-commits
ignore=body-is-missing
ignore=body-is-missing,title-max-length
48 changes: 0 additions & 48 deletions services/kube-prometheus-stack/44.2.1/defaults/cm.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,22 +160,6 @@ data:
- configMapRef:
name: cluster-info-configmap
additionalScrapeConfigs:
# Kubernetes API
- job_name: 'kubernetes-apiserver'
kubernetes_sd_configs:
- role: endpoints
namespaces:
names:
- default
scheme: https
tls_config:
ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
insecure_skip_verify: true
bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token
relabel_configs:
- source_labels: [__meta_kubernetes_service_name, __meta_kubernetes_endpoint_port_name]
action: keep
regex: kubernetes;https
# Kubernetes pods
- job_name: 'kubernetes-pods'
kubernetes_sd_configs:
Expand Down Expand Up @@ -266,38 +250,6 @@ data:
- source_labels: [__meta_kubernetes_namespace]
target_label: namespace
action: replace
- job_name: 'kubernetes-keepalived'
metrics_path: /snmp
params:
target: ["127.0.0.1:6161"]
module: ["keepalived"]
tls_config:
ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token
kubernetes_sd_configs:
- role: pod
namespaces:
names:
- kube-system
relabel_configs:
- source_labels: [__meta_kubernetes_pod_container_port_protocol]
regex: TCP
action: keep
- source_labels: [__meta_kubernetes_pod_container_port_number]
regex: "6161"
action: keep
- source_labels: [__meta_kubernetes_pod_container_port_name]
target_label: endpoint
action: replace
- source_labels: [__meta_kubernetes_pod_node_name]
target_label: node
action: replace
- source_labels: [__meta_kubernetes_pod_name]
target_label: pod
action: replace
- source_labels: [__meta_kubernetes_namespace]
target_label: namespace
action: replace
enableAdminAPI: true
walCompression: true
# secrets:
Expand Down
Loading