Skip to content

Commit f650187

Browse files
Merge tag 'refs/tags/v0.76.2' into release-2.12
v0.76.2 # -----BEGIN PGP SIGNATURE----- # # iQGzBAABCAAdFiEEmpYKpIznibxWDJLwZb5bgLvHpwcFAmbgFi0ACgkQZb5bgLvH # pweMHgwAtiiWTxwjO0Ek4D4E60jvHs5Bk77TDdVefgtz3nrhGZiVeYgUZqhUXBlv # eShzMcVB2akJYLBJ6/gtqGEPEyjhHLwWauaV6w1jd2LF0dvvMqos1tA6DS6o6wnm # WD4RkgaSpjrzYad1cibkNdtWnXbbshx7464142z5E7NKyLsnp3QSsZukjZLvnBkE # nhMofw8vOIRDYLFX1LXWKylzmnoAYZhX9Yek/draGJzuwoGnMNzar8e2Bz3t/Aka # s+fErbPyCJLiMXJXJmTNv0BSOjyjxcZZv3TP+GVbE51JfkeMvt7KQdNeZhEaulk/ # 8IRCIGF+E3nK8ga/T7qOjI9Q4CX7OccMSHu5rpgiGuj33iCrIDqFSoLA2dqnBpwg # IfJhlGuNH2B8Km7VpfEToYGHIImoPkdQMlC8F8zOdOPo1bYNoLMMWxx/a4roM8VW # OmjnHLi+6CNj6LQqQtozl+WpQyhxmVdO2jfX6Sl07R9y2mMksVmyVusL6UdFUvGx # mp9Wr/k0 # =B8S0 # -----END PGP SIGNATURE----- # gpg: directory '/home/runner/.gnupg' created # gpg: keybox '/home/runner/.gnupg/pubring.kbx' created # gpg: Signature made Tue Sep 10 09:49:33 2024 UTC # gpg: using RSA key 9A960AA48CE789BC560C92F065BE5B80BBC7A707 # gpg: Can't check signature: No public key
2 parents 233733b + adc6915 commit f650187

File tree

217 files changed

+53992
-6552
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

217 files changed

+53992
-6552
lines changed

Diff for: .github/workflows/checks.yaml

+7-3
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ jobs:
2626
go-version: '${{ env.golang-version }}'
2727
check-latest: true
2828
- run: make --always-make format generate && git diff --exit-code
29+
env:
30+
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
2931

3032
check-docs:
3133
runs-on: ubuntu-latest
@@ -39,6 +41,8 @@ jobs:
3941
go-version: '${{ env.golang-version }}'
4042
check-latest: true
4143
- run: make check-docs
44+
env:
45+
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
4246

4347
check-golang:
4448
runs-on: ubuntu-latest
@@ -54,9 +58,9 @@ jobs:
5458
- name: go.mod
5559
run: make tidy && git diff --exit-code
5660
- name: golangci-lint
57-
uses: golangci/golangci-lint-action@v6.0.1
61+
uses: golangci/golangci-lint-action@v6.1.0
5862
with:
59-
version: v1.57.2
63+
version: v1.59.1
6064
args: --timeout 10m0s --go ${{ env.golang-version }}
6165

6266
check-metrics:
@@ -89,6 +93,7 @@ jobs:
8993
go-version: '${{ env.golang-version }}'
9094
check-latest: true
9195
- run: make operator
96+
9297
po-rule-migration:
9398
runs-on: ubuntu-latest
9499
name: Build Prometheus Operator rule config map to rule file CRDs CLI tool
@@ -101,4 +106,3 @@ jobs:
101106
go-version: '${{ env.golang-version }}'
102107
check-latest: true
103108
- run: cd cmd/po-rule-migration && go install
104-

Diff for: .mdox.validate.yaml

+5
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,8 @@ validators:
3131
# Ignore anchor links pointing to the API documentation which are HTML <a> tags and not supported by mdox.
3232
- regex: 'api\.md#monitoring\.coreos\.com/v1\.(BasicAuth|PrometheusSpec|StorageSpec)$'
3333
type: ignore
34+
# Use the githubPullsIssues validator to avoid rate-limiting.
35+
- regex: '(^http[s]?:\/\/)(www\.)?(github\.com\/)prometheus-operator\/prometheus-operator(\/pull\/|\/issues\/)'
36+
type: githubPullsIssues
37+
# The GitHub actions running mdox configure the GITHUB_TOKEN environment variable.
38+
token: '$(GITHUB_TOKEN)'

Diff for: CHANGELOG.md

+23
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,26 @@
1+
## 0.76.2 / 2025-09-09
2+
3+
* [BUGFIX] Fix OAuth2 TLSConfig nil pointer. #6909
4+
5+
## 0.76.1 / 2025-09-03
6+
7+
* [BUGFIX] fix bug with Kubernetes service discovery `Selector.Role` field. #6896
8+
9+
## 0.76.0 / 2025-08-08
10+
11+
[CHANGE] Enhanced secret management in Prometheus and PrometheusAgent CRDs by switching the secrets field from atomic to listType: set, allowing independent handling of entries by different managers to prevent conflicts and improve deployment stability. #6762
12+
[CHANGE] Add API-level validations to Kubernetes SD in the ScrapeConfig CRD. #6678
13+
[FEATURE] Add TLS and Proxy settings to OAuth2 configuration for Prometheus and PrometheusAgent CRDs. #6735
14+
[FEATURE] Add support for OAuth2 in the ScrapeConfig CRD. #6814
15+
[FEATURE] Add scale subresource to the Alertmanger CRD. #6728
16+
[FEATURE] Add Scaleway service discovery to the ScrapeConfig CRD. #6711
17+
[FEATURE] Add `serviceDiscoveryRole` field to the Prometheus and PrometheusAgent CRDs to select between Endpoints (default) and EndpointSlice for discovering scrape and alerting targets. #6672
18+
[ENHANCEMENT] Make the `namespace` field optional in the Alertmanager endpoints configuration of the Prometheus CRD, if not defined it will use the `default` namespace. #6338
19+
[ENHANCEMENT] Add support to configure the TLS version for Prometheus, PrometheusAgent and Alertmanager CRDs. #6736
20+
[ENHANCEMENT] Add `-secret-label-selector` argument to the operator to filter the Secrets being watched. #6731
21+
[ENHANCEMENT] Add `attachMetadata` field to ScrapeClasses. #6756
22+
[BUGFIX] Add support for all proxy settings in the Alertmanager configuration. #6818
23+
124
## 0.75.2 / 2024-07-23
225

326
* [BUGFIX] Avoid invalid alerting config with TLS. #6765

Diff for: CONTRIBUTING.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
---
2-
weight: 120
2+
weight: 501
33
toc: true
44
title: Contributing
55
menu:
66
docs:
7-
parent: prologue
7+
parent: community
88
lead: ""
99
lastmod: "2021-03-08T08:48:57+00:00"
1010
images: []

Diff for: DCO

+12
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
---
2+
weight: 503
3+
toc: true
4+
title: DCO
5+
menu:
6+
docs:
7+
parent: community
8+
lead: ""
9+
images: []
10+
draft: false
11+
---
12+
113
Developer Certificate of Origin
214
Version 1.1
315

0 commit comments

Comments
 (0)