Skip to content

Commit

Permalink
Merge tag 'refs/tags/v0.76.2' into release-2.12
Browse files Browse the repository at this point in the history
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
  • Loading branch information
github-actions[bot] committed Sep 16, 2024
2 parents 233733b + adc6915 commit f650187
Show file tree
Hide file tree
Showing 217 changed files with 53,992 additions and 6,552 deletions.
10 changes: 7 additions & 3 deletions .github/workflows/checks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ jobs:
go-version: '${{ env.golang-version }}'
check-latest: true
- run: make --always-make format generate && git diff --exit-code
env:
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

check-docs:
runs-on: ubuntu-latest
Expand All @@ -39,6 +41,8 @@ jobs:
go-version: '${{ env.golang-version }}'
check-latest: true
- run: make check-docs
env:
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

check-golang:
runs-on: ubuntu-latest
Expand All @@ -54,9 +58,9 @@ jobs:
- name: go.mod
run: make tidy && git diff --exit-code
- name: golangci-lint
uses: golangci/golangci-lint-action@v6.0.1
uses: golangci/golangci-lint-action@v6.1.0
with:
version: v1.57.2
version: v1.59.1
args: --timeout 10m0s --go ${{ env.golang-version }}

check-metrics:
Expand Down Expand Up @@ -89,6 +93,7 @@ jobs:
go-version: '${{ env.golang-version }}'
check-latest: true
- run: make operator

po-rule-migration:
runs-on: ubuntu-latest
name: Build Prometheus Operator rule config map to rule file CRDs CLI tool
Expand All @@ -101,4 +106,3 @@ jobs:
go-version: '${{ env.golang-version }}'
check-latest: true
- run: cd cmd/po-rule-migration && go install

5 changes: 5 additions & 0 deletions .mdox.validate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,8 @@ validators:
# Ignore anchor links pointing to the API documentation which are HTML <a> tags and not supported by mdox.
- regex: 'api\.md#monitoring\.coreos\.com/v1\.(BasicAuth|PrometheusSpec|StorageSpec)$'
type: ignore
# Use the githubPullsIssues validator to avoid rate-limiting.
- regex: '(^http[s]?:\/\/)(www\.)?(github\.com\/)prometheus-operator\/prometheus-operator(\/pull\/|\/issues\/)'
type: githubPullsIssues
# The GitHub actions running mdox configure the GITHUB_TOKEN environment variable.
token: '$(GITHUB_TOKEN)'
23 changes: 23 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,26 @@
## 0.76.2 / 2025-09-09

* [BUGFIX] Fix OAuth2 TLSConfig nil pointer. #6909

## 0.76.1 / 2025-09-03

* [BUGFIX] fix bug with Kubernetes service discovery `Selector.Role` field. #6896

## 0.76.0 / 2025-08-08

[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
[CHANGE] Add API-level validations to Kubernetes SD in the ScrapeConfig CRD. #6678
[FEATURE] Add TLS and Proxy settings to OAuth2 configuration for Prometheus and PrometheusAgent CRDs. #6735
[FEATURE] Add support for OAuth2 in the ScrapeConfig CRD. #6814
[FEATURE] Add scale subresource to the Alertmanger CRD. #6728
[FEATURE] Add Scaleway service discovery to the ScrapeConfig CRD. #6711
[FEATURE] Add `serviceDiscoveryRole` field to the Prometheus and PrometheusAgent CRDs to select between Endpoints (default) and EndpointSlice for discovering scrape and alerting targets. #6672
[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
[ENHANCEMENT] Add support to configure the TLS version for Prometheus, PrometheusAgent and Alertmanager CRDs. #6736
[ENHANCEMENT] Add `-secret-label-selector` argument to the operator to filter the Secrets being watched. #6731
[ENHANCEMENT] Add `attachMetadata` field to ScrapeClasses. #6756
[BUGFIX] Add support for all proxy settings in the Alertmanager configuration. #6818

## 0.75.2 / 2024-07-23

* [BUGFIX] Avoid invalid alerting config with TLS. #6765
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
---
weight: 120
weight: 501
toc: true
title: Contributing
menu:
docs:
parent: prologue
parent: community
lead: ""
lastmod: "2021-03-08T08:48:57+00:00"
images: []
Expand Down
12 changes: 12 additions & 0 deletions DCO
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
---
weight: 503
toc: true
title: DCO
menu:
docs:
parent: community
lead: ""
images: []
draft: false
---

Developer Certificate of Origin
Version 1.1

Expand Down
Loading

0 comments on commit f650187

Please sign in to comment.