Skip to content

Commit 18ef56a

Browse files
committed
Remove ec lint, which we don't really need and also fix some lint issues
Signed-off-by: Pete Wall <pete.wall@grafana.com>
1 parent a739f35 commit 18ef56a

17 files changed

+16
-72
lines changed

.github/workflows/reviewdog.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -121,16 +121,6 @@ jobs:
121121
github_token: ${{ secrets.github_token }}
122122
reporter: github-check
123123

124-
eclint:
125-
name: runner / eclint
126-
runs-on: ubuntu-latest
127-
steps:
128-
- uses: actions/checkout@v4
129-
- uses: reviewdog/action-eclint@v1
130-
with:
131-
github_token: ${{ secrets.github_token }}
132-
reporter: github-check
133-
134124
textlint:
135125
name: runner / textlint
136126
runs-on: ubuntu-latest

Makefile

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -42,40 +42,33 @@ clean:
4242
####################################################################
4343
# Linting #
4444
####################################################################
45-
.PHONY: lint lint-chart lint-sh lint-md lint-txt lint-yml lint-ec lint-alex lint-misspell lint-actionlint
46-
lint: lint-chart lint-sh lint-md lint-txt lint-yml lint-ec lint-alex lint-misspell lint-actionlint
45+
.PHONY: lint lint-sh lint-md lint-txt lint-yml lint-alex lint-misspell lint-actionlint
46+
lint: lint-sh lint-md lint-txt lint-yml lint-alex lint-misspell lint-actionlint
4747

48-
lint-chart:
49-
ct lint --debug --lint-conf .configs/lintconf.yaml --check-version-increment=false
50-
51-
# Shell Linting
48+
# Shell Linting for checking shell scripts
5249
lint-sh lint-shell:
5350
@./scripts/lint-shell.sh || true
5451

55-
# Markdown Linting
52+
# Markdown Linting for checking markdown files
5653
lint-md lint-markdown:
5754
@./scripts/lint-markdown.sh || true
5855

59-
# Text Linting
56+
# Text Linting for checking text files
6057
lint-txt lint-text:
6158
@./scripts/lint-text.sh || true
6259

63-
# Yaml Linting
60+
# Yaml Linting for checking yaml files
6461
lint-yml lint-yaml:
6562
@./scripts/lint-yaml.sh || true
6663

67-
# Editorconfig Linting
68-
lint-ec lint-editorconfig:
69-
@./scripts/lint-editorconfig.sh || true
70-
71-
# Alex Linting
64+
# Alex Linting for checking insensitive language
7265
lint-alex:
7366
@./scripts/lint-alex.sh || true
7467

75-
# Misspell Linting
68+
# Misspell Linting for checking common spelling mistakes
7669
lint-misspell:
7770
@./scripts/lint-misspell.sh || true
7871

79-
# Actionlint Linting
72+
# Actionlint Linting for checking GitHub Actions
8073
lint-al lint-actionlint:
8174
@./scripts/lint-actionlint.sh || true

charts/feature-cluster-metrics/README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ action on the metric list, including filtering based on label or other actions.
142142
| https://sustainable-computing-io.github.io/kepler-helm-chart | kepler | 0.5.9 |
143143
<!-- markdownlint-enable no-bare-urls -->
144144

145+
<!-- markdownlint-disable no-space-in-emphasis -->
145146
## Values
146147

147148
### API Server
@@ -320,3 +321,4 @@ action on the metric list, including filtering based on label or other actions.
320321
| windows-exporter.metricsTuning.includeMetrics | list | `[]` | Metrics to keep. Can use regular expressions. |
321322
| windows-exporter.metricsTuning.useDefaultAllowList | bool | `true` | Filter the list of metrics from Windows Exporter to the minimal set required for Kubernetes Monitoring. See [Metrics Tuning and Allow Lists](#metrics-tuning-and-allow-lists) |
322323
| windows-exporter.scrapeInterval | string | `60s` | How frequently to scrape metrics from Windows Exporter. |
324+
<!-- markdownlint-enable no-space-in-emphasis -->

charts/feature-cluster-metrics/README.md.gotmpl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,4 +136,6 @@ action on the metric list, including filtering based on label or other actions.
136136
{{ template "chart.requirementsSection" . }}
137137
<!-- markdownlint-enable no-bare-urls -->
138138

139+
<!-- markdownlint-disable no-space-in-emphasis -->
139140
{{ template "chart.valuesSection" . }}
141+
<!-- markdownlint-enable no-space-in-emphasis -->

charts/k8s-monitoring/Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,9 @@ alloy_configs = $(shell \
6969
DIR="$(shell dirname $(1))/" yq e 'with_entries(select(.key == "alloy-*")) | select(.[].enabled == true) | to_entries | env(DIR) + .[].key + ".alloy"' $(1) \
7070
)
7171

72-
# TODO: make this dependent on
72+
# TODO: Ideally, this shouldn't result in "modified" files if the subchart content is the same.
73+
# The issue is that tar and gz include things like timestamps in their headers, which will
74+
# result in different hashes for the same content. Not great for Makefiles or modified file checks.
7375
Chart.lock: Chart.yaml
7476
helm dependency update .
7577

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
"dependencies": {},
1818
"devDependencies": {
1919
"alex": "^11.0.1",
20-
"editorconfig-checker": "^5.1.9",
2120
"markdownlint-cli2": "^0.14.0",
2221
"textlint": "^14.2.0",
2322
"textlint-rule-common-misspellings": "^1.0.1",

scripts/lint-editorconfig.sh

Lines changed: 0 additions & 39 deletions
This file was deleted.

yarn.lock

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -889,11 +889,6 @@ eastasianwidth@^0.2.0:
889889
resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb"
890890
integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==
891891

892-
editorconfig-checker@^5.1.9:
893-
version "5.1.9"
894-
resolved "https://registry.yarnpkg.com/editorconfig-checker/-/editorconfig-checker-5.1.9.tgz#6edf46da8362069c6edab10c7e9318ee8b10d533"
895-
integrity sha512-p1XFFxEkhY9Nl+kuMLZA6PzzZ6s+dvy4yBmJD68tC4BwBQdjUh2p1VxA6IbtN5beaX6i7WtHeEsvTK5LF+W+OQ==
896-
897892
emoji-regex@^8.0.0:
898893
version "8.0.0"
899894
resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"

0 commit comments

Comments
 (0)