Merge tag 'refs/tags/v0.75.2' into release-2.12

v0.75.2
stolostron · Jul 24, 2024 · 55f51df · 55f51df
2 parents 5c73e5b + 35b0f45
commit 55f51df
Show file tree

Hide file tree

Showing 382 changed files with 112,803 additions and 64,204 deletions.
diff --git a/.github/env b/.github/env
@@ -1,3 +1,3 @@
 golang-version=1.22
-kind-version=v0.21.0
-kind-image=kindest/node:v1.29.2
+kind-version=v0.23.0
+kind-image=kindest/node:v1.30.0
diff --git a/.github/workflows/checks.yaml b/.github/workflows/checks.yaml
@@ -54,13 +54,10 @@ jobs:
       - name: go.mod
         run: make tidy && git diff --exit-code
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v4.0.0
+        uses: golangci/golangci-lint-action@v6.0.1
         with:
-          version: v1.56.2
+          version: v1.57.2
           args: --timeout 10m0s --go ${{ env.golang-version }}
-          # Disable caching as a workaround for https://github.com/golangci/golangci-lint-action/issues/135.
-          # The line can be removed once the golangci-lint issue is resolved.
-          skip-pkg-cache: true
 
   check-metrics:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/e2e-feature-gated.yaml b/.github/workflows/e2e-feature-gated.yaml
@@ -0,0 +1,64 @@
+name: e2e-feature-gated
+on:
+  pull_request:
+    paths-ignore:
+      - '**/*.md'
+  push:
+    branches:
+      - 'release-*'
+      - 'master'
+      - 'main'
+    tags:
+      - 'v*'
+    paths-ignore:
+      - '**/*.md'
+jobs:
+  e2e-tests:
+    name: E2E tests for feature gates
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - name: Import environment variables from file
+      run: cat ".github/env" >> $GITHUB_ENV
+    - name: Install Go
+      uses: actions/setup-go@v5
+      with:
+        go-version: '${{ env.golang-version }}'
+        check-latest: true
+    - name: Build images
+      run: |
+        export SHELL=/bin/bash
+        make build image
+    - name: Start kind cluster
+      uses: helm/[email protected]
+      with:
+        version: ${{ env.kind-version }}
+        node_image: ${{ env.kind-image }}
+        wait: 300s
+        config: ./test/e2e/kind-conf.yaml
+        cluster_name: e2e
+    - name: Wait for cluster to finish bootstraping
+      run: |
+        echo "Waiting for all nodes to be ready..."
+        kubectl wait --for=condition=Ready nodes --all --timeout=120s
+        kubectl get nodes
+        echo "Waiting for all pods to be ready..."
+        kubectl wait --for=condition=Ready pods --all --all-namespaces --timeout=300s
+        kubectl get pods -A
+        echo "Cluster information"
+        kubectl cluster-info
+    - name: Load images
+      run: |
+        kind load docker-image -n e2e quay.io/prometheus-operator/prometheus-operator:$(git rev-parse --short HEAD)
+        kind load docker-image -n e2e quay.io/prometheus-operator/prometheus-config-reloader:$(git rev-parse --short HEAD)
+        kind load docker-image -n e2e quay.io/prometheus-operator/admission-webhook:$(git rev-parse --short HEAD)
+        kubectl apply -f scripts/kind-rbac.yaml
+    - name: Run tests
+      run: >
+        EXCLUDE_ALERTMANAGER_TESTS=exclude
+        EXCLUDE_PROMETHEUS_TESTS=exclude
+        EXCLUDE_PROMETHEUS_ALL_NS_TESTS=exclude
+        EXCLUDE_THANOSRULER_TESTS=exclude
+        EXCLUDE_OPERATOR_UPGRADE_TESTS=exclude
+        EXCLUDE_PROMETHEUS_UPGRADE_TESTS=exclude
+        make test-e2e
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
@@ -26,35 +26,30 @@ jobs:
             alertmanager: ""
             thanosruler: "exclude"
             operatorUpgrade: "exclude"
-            featureGated: "include"
           - suite: prometheus
             prometheus: ""
             prometheusAllNS: "exclude"
             alertmanager: "exclude"
             thanosruler: "exclude"
             operatorUpgrade: "exclude"
-            featureGated: "include"
           - suite: prometheusAllNS
             prometheus: "exclude"
             prometheusAllNS: ""
             alertmanager: "exclude"
             thanosruler: "exclude"
             operatorUpgrade: "exclude"
-            featureGated: "include"
           - suite: thanosruler
             prometheus: "exclude"
             prometheusAllNS: "exclude"
             alertmanager: "exclude"
             thanosruler: ""
             operatorUpgrade: "exclude"
-            featureGated: "include"
           - suite: operatorUpgrade
             prometheus: "exclude"
             prometheusAllNS: "exclude"
             alertmanager: "exclude"
             thanosruler: "exclude"
             operatorUpgrade: ""
-            featureGated: "include"
     steps:
     - uses: actions/checkout@v4
     - name: Import environment variables from file
@@ -69,7 +64,7 @@ jobs:
         export SHELL=/bin/bash
         make build image
     - name: Start kind cluster
-      uses: helm/kind-action@v1.9.0
+      uses: helm/kind-action@v1.10.0
       with:
         version: ${{ env.kind-version }}
         node_image: ${{ env.kind-image }}
@@ -78,9 +73,14 @@ jobs:
         cluster_name: e2e
     - name: Wait for cluster to finish bootstraping
       run: |
+        echo "Waiting for all nodes to be ready..."
+        kubectl wait --for=condition=Ready nodes --all --timeout=120s
+        kubectl get nodes
+        echo "Waiting for all pods to be ready..."
         kubectl wait --for=condition=Ready pods --all --all-namespaces --timeout=300s
-        kubectl cluster-info
         kubectl get pods -A
+        echo "Cluster information"
+        kubectl cluster-info
     - name: Load images
       run: |
         kind load docker-image -n e2e quay.io/prometheus-operator/prometheus-operator:$(git rev-parse --short HEAD)
@@ -94,7 +94,7 @@ jobs:
         EXCLUDE_PROMETHEUS_ALL_NS_TESTS=${{ matrix.prometheusAllNS }}
         EXCLUDE_THANOSRULER_TESTS=${{ matrix.thanosruler }}
         EXCLUDE_OPERATOR_UPGRADE_TESTS=${{ matrix.operatorUpgrade }}
-        FEATURE_GATED_TESTS=${{ matrix.featureGated }}
+        EXCLUDE_FEATURE_GATED_TESTS=exclude
         EXCLUDE_PROMETHEUS_UPGRADE_TESTS=exclude
         make test-e2e
 

diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
@@ -37,7 +37,7 @@ jobs:
       - name: Check the cosign version
         run: cosign version
       - name: Install crane
-        uses: imjasonh/setup-crane@v0.3
+        uses: imjasonh/setup-crane@v0.4
       - name: Login to quay.io
         uses: docker/login-action@v3
         with:

diff --git a/.github/workflows/stale.yaml b/.github/workflows/stale.yaml
@@ -15,8 +15,7 @@ jobs:
           days-before-stale: 60
           days-before-issue-close: 120
           days-before-pr-close: 180
-          exempt-issue-labels: 'kind/feature,help wanted,kind/bug,kind/documentation'
+          exempt-issue-labels: 'kind/feature,help wanted,kind/bug,kind/documentation,needs-triage'
           stale-issue-label: 'stale'
           stale-pr-label: 'stale'
-          exempt-draft-pr: true
           operations-per-run: 500
diff --git a/.github/workflows/test-prom-version-upgrade.yaml b/.github/workflows/test-prom-version-upgrade.yaml
@@ -21,7 +21,7 @@ jobs:
         export SHELL=/bin/bash
         make build image
     - name: Start KinD
-      uses: helm/kind-action@v1.9.0
+      uses: helm/kind-action@v1.10.0
       with:
         version: ${{ env.kind-version }}
         node_image: ${{ env.kind-image }}
@@ -47,5 +47,5 @@ jobs:
         EXCLUDE_PROMETHEUS_ALL_NS_TESTS=exclude
         EXCLUDE_THANOSRULER_TESTS=exclude
         EXCLUDE_OPERATOR_UPGRADE_TESTS=exclude
-        FEATURE_GATED_TESTS=exclude 
+        EXCLUDE_FEATURE_GATED_TESTS=exclude 
         make test-e2e
diff --git a/.golangci.yml b/.golangci.yml
@@ -19,7 +19,11 @@ issues:
 
 linters-settings:
   errcheck:
-    exclude: scripts/errcheck_excludes.txt
+    exclude-functions:
+      # Any error in HTTP handlers is handled by the server itself.
+      - (net/http.ResponseWriter).Write
+      # Never check for logger errors.
+      - (github.com/go-kit/log.Logger).Log
   gci:
     sections:
       - standard

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,46 @@
+## 0.75.2 / 2024-07-23
+
+* [BUGFIX] Avoid invalid alerting config with TLS. #6765
+
+## 0.75.1 / 2024-07-02
+
+* [BUGFIX] Fix OVHCloud service discovery configs key error. #6723
+
+## 0.75.0 / 2024-06-26
+
+* [CHANGE] Global limits over enforced limits when no user limits are set. #6608
+* [CHANGE/BUGFIX] Use a separate port number (`8081`) for the init container. #6635
+* [FEATURE] Add `source` field in `pagerdutyConfigs` in `AlertManangerConfig` CRD. #6427
+* [FEATURE] Add `DockerSwarm` Service Discovery support in the ScrapeConfig CRD. #6633
+* [FEATURE] Add `Linode` Service Discovery support in the ScrapeConfig CRD. #6586
+* [FEATURE] Add `PuppetDB` Service Discovery support in the ScrapeConfig CRD. #6651
+* [FEATURE] Add `LightSail` Service Discovery support in the ScrapeConfig CRD. #6660
+* [FEATURE] Add `OVHCloud` Service Discovery support in the ScrapeConfig CRD. #6689
+* [FEATURE] Add extra metric relabelings to scrape classes. #6492
+* [FEATURE] Add `jobName` field to ScrapeConfig CRD. #6618
+* [FEATURE] Add automatic memory limit handling using the flag `-auto-gomemlimit-ratio`. #6591
+* [FEATURE] Add support for ProxyConfig in Prometheus RemoteWrite and RemoteRead specs. #6512
+* [ENHANCEMENT] Add automatic `GOMAXPROCS` to admission webhook. #6599
+* [ENHANCEMENT] Add `prometheus_operator_feature_gate_info` metric. #6655
+* [BUGFIX] Fix reloading `Alertmanager` when notification templates change. #6607
+* [BUGFIX] Fix PrometheusAgent reconciliation for the statefulset changes. #6615
+* [BUGFIX] Fix readiness/liveness probes for config-reloader when listenLocal is set to true. #6698
+
+## 0.74.0 / 2024-05-17
+
+* [CHANGE/BUGFIX] Change the `proxyConnectHeader` field of the proxy configuration in the `ScrapeConfig` CRD from a map of strings to a map of string slices. #6541
+* [CHANGE] Automatically set the GOMAXPROCS variable according to the CPU limits of the process cgroup. #6576
+* [FEATURE] Add support for the Nomad Service Discovery to the `ScrapeConfig` CRD. #6485
+* [FEATURE] Add `relabelings` field for Alertmanager's endpoints in the `Prometheus` CRD. #6467
+* [FEATURE] Add `alertRelabelings` field for the Alertmanager's endpoints in the `Prometheus` CRD. #6450
+* [FEATURE] Add support for the Azure SDK authentication to the Azure Service Discovery in the `ScrapeConfig` CRD. #6595
+* [FEATURE] Add support for the Azure SDK authentication to the remote-write configuration in the `Prometheus` and `PrometheusAgent` CRDs. #6596
+* [ENHANCEMENT] Add Go runtime scheduler metrics to the operator. #6563
+* [ENHANCEMENT] Add `go_sync_mutex_wait_total_seconds_total` metric to the operator. #6581
+* [BUGFIX] Allow templated strings for the responder's `type` in OpsGenie configuration. #6378
+* [BUGFIX] Fix nil pointer panic in the `AlertmanagerConfig` Webex receiver. #6582
+* [BUGFIX] Apply TLS scrape class settings to all `PodMonitor`, `Probe` and `ScrapeConfig` objects. #6573
+
 ## 0.73.2 / 2024-04-18
 
 * [BUGFIX] Fix ScrapeClassTLSConfig nil pointer exception. #6526

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -46,6 +46,8 @@ meetings happen at 11:00 UTC on Monday, check the [online
 notes](https://docs.google.com/document/d/1-fjJmzrwRpKmSPHtXN5u6VZnn39M28KqyQGBEJsqUOk/edit?usp=sharing)
 to know the exact dates and the connection details.
 
+An invite is also available on the [project's public calendar](https://calendar.google.com/calendar/u/1/embed?src=c_331fefe21da6f878f17e5b752d63e19d58b1e3bb24cb82e5ac65e5fd14e81878@group.calendar.google.com&csspa=1).
+
 ## Getting Started
 
 - Fork the repository on GitHub