Skip to content

Commit 6b27a06

Browse files
authored
fix markdown & adjust linters (#1978)
Signed-off-by: André Bauer <[email protected]>
1 parent 47c064f commit 6b27a06

File tree

10 files changed

+26
-25
lines changed

10 files changed

+26
-25
lines changed

.github/linters/.markdown-lint.yml

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
MD013:
2+
line_length: 600
File renamed without changes.

.github/workflows/lint-test.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- name: Run chart-testing (list-changed)
2727
id: list-changed
2828
run: |
29-
changed=$(ct list-changed --config ct.yaml)
29+
changed=$(ct list-changed --config .github/linters/ct.yaml)
3030
if [[ -n "$changed" ]]; then
3131
echo "::set-output name=changed::true"
3232
fi
@@ -38,11 +38,11 @@ jobs:
3838
helm plugin install https://github.com/quintush/helm-unittest.git --version 0.2.8
3939
4040
- name: Run chart-testing (lint)
41-
run: ct lint --config ct.yaml
41+
run: ct lint --config .github/linters/ct.yaml
4242

4343
- name: Create kind cluster
4444
uses: helm/[email protected]
4545
if: steps.list-changed.outputs.changed == 'true'
4646

4747
- name: Run chart-testing (install)
48-
run: ct install --config ct.yaml
48+
run: ct install --config .github/linters/ct.yaml

.github/workflows/linter.yml renamed to .github/workflows/superlinter.yml

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ jobs:
2020
env:
2121
DEFAULT_BRANCH: main
2222
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
23+
LINTER_RULES_PATH: .github/linters
2324
VALIDATE_ALL_CODEBASE: false
2425
VALIDATE_BASH: false
2526
VALIDATE_JSCPD: false

.markdownlintignore

-2
This file was deleted.

.textlintrc

Whitespace-only changes.

CODE_OF_CONDUCT.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
## Prometheus Community Code of Conduct
1+
# Prometheus Community Code of Conduct
22

33
Prometheus follows the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md).

SECURITY.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
The Prometheus security policy, including how to report vulnerabilities, can be
44
found here:
55

6-
https://prometheus.io/docs/operating/security/
6+
<https://prometheus.io/docs/operating/security/>

charts/kube-prometheus-stack/Chart.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ name: kube-prometheus-stack
2323
sources:
2424
- https://github.com/prometheus-community/helm-charts
2525
- https://github.com/prometheus-operator/kube-prometheus
26-
version: 34.9.0
26+
version: 34.9.1
2727
appVersion: 0.55.0
2828
kubeVersion: ">=1.16.0-0"
2929
home: https://github.com/prometheus-operator/kube-prometheus

charts/kube-prometheus-stack/README.md

+17-17
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,19 @@ _Note: This chart was formerly named `prometheus-operator` chart, now renamed to
1111
- Kubernetes 1.16+
1212
- Helm 3+
1313

14-
## Get Repo Info
14+
## Get Helm Repository Info
1515

1616
```console
1717
helm repo add prometheus-community https://prometheus-community.github.io/helm-charts
1818
helm repo update
1919
```
2020

21-
_See [helm repo](https://helm.sh/docs/helm/helm_repo/) for command documentation._
21+
_See [`helm repo`](https://helm.sh/docs/helm/helm_repo/) for command documentation._
2222

23-
## Install Chart
23+
## Install Helm Chart
2424

2525
```console
26-
# Helm
27-
$ helm install [RELEASE_NAME] prometheus-community/kube-prometheus-stack
26+
helm install [RELEASE_NAME] prometheus-community/kube-prometheus-stack
2827
```
2928

3029
_See [configuration](#configuration) below._
@@ -43,11 +42,10 @@ To disable dependencies during installation, see [multiple releases](#multiple-r
4342

4443
_See [helm dependency](https://helm.sh/docs/helm/helm_dependency/) for command documentation._
4544

46-
## Uninstall Chart
45+
## Uninstall Helm Chart
4746

4847
```console
49-
# Helm
50-
$ helm uninstall [RELEASE_NAME]
48+
helm uninstall [RELEASE_NAME]
5149
```
5250

5351
This removes all the Kubernetes components associated with the chart and deletes the release.
@@ -70,8 +68,7 @@ kubectl delete crd thanosrulers.monitoring.coreos.com
7068
## Upgrading Chart
7169

7270
```console
73-
# Helm
74-
$ helm upgrade [RELEASE_NAME] prometheus-community/kube-prometheus-stack
71+
helm upgrade [RELEASE_NAME] prometheus-community/kube-prometheus-stack
7572
```
7673

7774
With Helm v3, CRDs created by this chart are not updated by default and should be manually updated.
@@ -84,9 +81,11 @@ _See [helm upgrade](https://helm.sh/docs/helm/helm_upgrade/) for command documen
8481
A major chart version change (like v1.2.3 -> v2.0.0) indicates that there is an incompatible breaking change needing manual actions.
8582

8683
### From 33.x to 34.x
84+
8785
This upgrades to prometheus-operator to v0.55.0 and prometheus to v2.33.5.
8886

8987
Run these commands to update the CRDs before applying the upgrade.
88+
9089
```console
9190
kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.55.0/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml
9291
kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.55.0/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml
@@ -98,14 +97,16 @@ kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-oper
9897
kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.55.0/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml
9998
```
10099

101-
102100
### From 32.x to 33.x
103-
This upgrades the node exporter Chart to v3.0.0. Please review the changes to this subchart if you make customizations to hostMountPropagation.
101+
102+
This upgrades the prometheus-node-exporter Chart to v3.0.0. Please review the changes to this subchart if you make customizations to hostMountPropagation.
104103

105104
### From 31.x to 32.x
105+
106106
This upgrades to prometheus-operator to v0.54.0 and prometheus to v2.33.1. It also changes the default for `grafana.serviceMonitor.enabled` to `true.
107107

108108
Run these commands to update the CRDs before applying the upgrade.
109+
109110
```console
110111
kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.54.0/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml
111112
kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.54.0/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml
@@ -117,7 +118,6 @@ kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-oper
117118
kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.54.0/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml
118119
```
119120

120-
121121
### From 30.x to 31.x
122122

123123
This version removes the built-in grafana ServiceMonitor and instead relies on the ServiceMonitor of the sub-chart.
@@ -145,7 +145,7 @@ If you are using PodSecurityPolicies you can enable the previous behaviour by se
145145

146146
### From 26.x to 27.x
147147

148-
This version splits Node Exporter recording and altering rules in separate config values.
148+
This version splits prometheus-node-exporter chart recording and altering rules in separate config values.
149149
Instead of `defaultRules.rules.node` the 2 new variables `defaultRules.rules.nodeExporterAlerting` and `defaultRules.rules.nodeExporterRecording` are used.
150150

151151
Also the following defaultRules.rules has been removed as they had no effect: `kubeApiserverError`, `kubePrometheusNodeAlerting`, `kubernetesAbsent`, `time`.
@@ -173,7 +173,7 @@ kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-oper
173173

174174
### From 23.x to 24.x
175175

176-
The custom `ServiceMonitor` for the _kube-state-metrics_ & _prometheus-node-exporter_ charts have been removed in favour of the built in sub-chart `ServiceMonitor`; for both sub-charts this means that `ServiceMonitor` customisations happen via the values passed to the chart. If you haven't directly customised this behaviour then there are no changes required to upgrade, but if you have please read the following.
176+
The custom `ServiceMonitor` for the _kube-state-metrics_ & _prometheus-node-exporter_ charts have been removed in favour of the built-in sub-chart `ServiceMonitor`; for both sub-charts this means that `ServiceMonitor` customisations happen via the values passed to the chart. If you haven't directly customised this behaviour then there are no changes required to upgrade, but if you have please read the following.
177177

178178
For _kube-state-metrics_ the `ServiceMonitor` customisation is now set via `kube-state-metrics.prometheus.monitor` and the `kubeStateMetrics.serviceMonitor.selfMonitor.enabled` value has moved to `kube-state-metrics.selfMonitor.enabled`.
179179

@@ -395,7 +395,7 @@ With Prometheus Operator version 0.30+, the core Prometheus Operator pod exposes
395395

396396
A validating and mutating webhook configuration requires the endpoint to which the request is sent to use TLS. It is possible to set up custom certificates to do this, but in most cases, a self-signed certificate is enough. The setup of this component requires some more complex orchestration when using helm. The steps are created to be idempotent and to allow turning the feature on and off without running into helm quirks.
397397

398-
1. A pre-install hook provisions a certificate into the same namespace using a format compatible with provisioning using end-user certificates. If the certificate already exists, the hook exits.
398+
1. A pre-install hook provisions a certificate into the same namespace using a format compatible with provisioning using end user certificates. If the certificate already exists, the hook exits.
399399
2. The prometheus operator pod is configured to use a TLS proxy container, which will load that certificate.
400400
3. Validating and Mutating webhook configurations are created in the cluster, with their failure mode set to Ignore. This allows rules to be created by the same chart at the same time, even though the webhook has not yet been fully set up - it does not have the correct CA field set.
401401
4. A post-install hook reads the CA from the secret created by step 1 and patches the Validating and Mutating webhook configurations. This process will allow a custom CA provisioned by some other process to also be patched into the webhook configurations. The chosen failure policy is also patched into the webhook configurations
@@ -412,7 +412,7 @@ Because the operator can only run as a single pod, there is potential for this c
412412

413413
## Developing Prometheus Rules and Grafana Dashboards
414414

415-
This chart Grafana Dashboards and Prometheus Rules are just a copy from [prometheus-operator/prometheus-operator](https://github.com/prometheus-operator/prometheus-operator) and other sources, synced (with alterations) by scripts in [hack](hack) folder. In order to introduce any changes you need to first [add them to the original repo](https://github.com/prometheus-operator/kube-prometheus/blob/master/docs/developing-prometheus-rules-and-grafana-dashboards.md) and then sync there by scripts.
415+
This chart Grafana Dashboards and Prometheus Rules are just a copy from [prometheus-operator/prometheus-operator](https://github.com/prometheus-operator/prometheus-operator) and other sources, synced (with alterations) by scripts in [hack](hack) folder. In order to introduce any changes you need to first [add them to the original repository](https://github.com/prometheus-operator/kube-prometheus/blob/master/docs/developing-prometheus-rules-and-grafana-dashboards.md) and then sync there by scripts.
416416

417417
## Further Information
418418

0 commit comments

Comments
 (0)