OCPBUGS-24323: Bump openshift/prometheus-operator to v0.70.0

.github/workflows/checks.yaml

@@ -26,6 +26,7 @@ jobs:
         go-version: '${{ env.golang-version }}'
         check-latest: true
     - run: make --always-make format generate && git diff --exit-code
+
   check-docs:
     runs-on: ubuntu-latest
     name: Check Documentation formatting and links
@@ -38,6 +39,7 @@ jobs:
         go-version: '${{ env.golang-version }}'
         check-latest: true
     - run: make check-docs
+
   check-golang:
     runs-on: ubuntu-latest
     name: Golang linter
@@ -49,11 +51,14 @@ jobs:
         with:
           go-version: '${{ env.golang-version }}'
           check-latest: true
+      - name: go.mod
+        run: make tidy && git diff --exit-code
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3.7.0
         with:
-          version: v1.53.1
+          version: v1.55.2
           args: --timeout 10m0s
+
   check-metrics:
     runs-on: ubuntu-latest
     name: Check prometheus metrics
@@ -66,6 +71,7 @@ jobs:
         go-version: '${{ env.golang-version }}'
         check-latest: true
     - run: make check-metrics
+
   build:
     runs-on: ${{ matrix.os }}
     strategy:

.github/workflows/e2e.yaml

@@ -1,13 +1,17 @@
 name: e2e
 on:
   pull_request:
+    paths-ignore:
+      - '**/*.md'
   push:
     branches:
       - 'release-*'
       - 'master'
       - 'main'
     tags:
       - 'v*'
+    paths-ignore:
+      - '**/*.md'
 jobs:
   e2e-tests:
     name: E2E tests

.github/workflows/stale.yaml

@@ -11,9 +11,10 @@ jobs:
         with:
           stale-issue-message: 'This issue has been automatically marked as stale because it has not had any activity in the last 60 days. Thank you for your contributions.'
           close-issue-message: 'This issue was closed because it has not had any activity in the last 120 days. Please reopen if you feel this is still valid.'
+          close-pr-message: "This pull request is being closed because it had no activity in the last 180 days. This is not a signal from the maintainers that the PR has no value. We appreciate the time and effort that you put into this work. If you're willing to re-open it, the maintainers will do their best to review it."
           days-before-stale: 60
           days-before-issue-close: 120
-          days-before-pr-close: -1  # Prevent closing PRs
+          days-before-pr-close: 180
           exempt-issue-labels: 'kind/feature,help wanted,kind/bug,kind/documentation'
           stale-issue-label: 'stale'
           stale-pr-label: 'stale'

.github/workflows/unit.yaml

@@ -1,13 +1,17 @@
 name: unit
 on:
   pull_request:
+    paths-ignore:
+      - '**/*.md'
   push:
     branches:
       - 'release-*'
       - 'master'
       - 'main'
     tags:
       - 'v*'
+    paths-ignore:
+      - '**/*.md'
 jobs:
   unit-tests:
     runs-on: ubuntu-latest

.golangci.yml

@@ -28,35 +28,6 @@ linters-settings:
   depguard:
     rules:
       forbid-pkg-errors:
-        files:
-        - "**/admission/*.go"
-        - "**/alertmanager/*.go"
-        - "**/alertmanager/**/*.go"
-        - "**/apis/*.go"
-        - "**/apis/**/*.go"
-        - "**/assets/*.go"
-        - "**/client/*.go"
-        - "**/client/**/*.go"
-        - "**/informers/*.go"
-        - "**/k8sutil/*.go"
-        - "**/listwatch/*.go"
-        - "**/namespacelabeler/*.go"
-        - "**/operator/*.go"
-        - "**/prometheus/*.go"
-        - "**/prometheus/**/*.go"
-        - "**/server/*.go"
-        - "**/thanos/*.go"
-        - "**/versionutil/*.go"
-        - "**/webconfig/*.go"
-        - "**/e2e/*.go"
-        - "**/framework/admission_webhooks.go"
-        - "**/framework/alertmanager.go"
-        - "**/framework/cluster_role_binding.go"
-        - "**/framework/cluster_role.go"
-        - "**/framework/configmap.go"
-        - "**/framework/context.go"
-        - "**/framework/crd.go"
-        - "**/framework/framework.go"
         deny:
         - pkg: "github.com/pkg/errors"
           dsc: Should be replaced with standard lib errors or fmt.Errorf

CHANGELOG.md

@@ -1,3 +1,21 @@
+## 0.70.0 / 2023-11-30
+
+* [CHANGE] Use camelCase on scrapeConfig in prometheus job names. #6124
+* [CHANGE] Update field names for ConsulSD configs. #6094
+* [FEATURE] Add `trackTimestampsStaleness` field to `ServiceMonitor`, `PodMonitor` and `ScrapeConfig` CRDs. #6105
+* [FEATURE] Add `persistentVolumeClaimRetentionPolicy` field to the `Prometheus` and `PrometheusAgent` CRDs. #6038
+* [FEATURE] Support service,pod,endpoints,endpointslice,ingress roles to `KubernetesSDConfigs` in `ScrapeConfig` CRD. #6089
+* [FEATURE] Add support for Azure SD and GCE SD in `ScrapeConfig` CRD. #6078 #6009
+* [FEATURE] Add azure AD oauth support to remote write. #6037
+* [FEATURE] Add `.spec.reloadStrategy` to the Prometheus and PrometheusAgent CRDs. The value can be `HTTP` (default if not specified) or `ProcessSignal`. #5690
+* [ENHANCEMENT] Expose flag to enable the reloader probes in the jsonnet configuration. #6075
+* [ENHANCEMENT] Reduce memory usage for clusters with large number of secrets and/or configmaps. #5993
+* [ENHANCEMENT] Config reloader now sends all logs to `os.Stdout`. #6085
+* [BUGFIX] Remove verbose logging in admission-webhook pods. #6095
+* [BUGFIX] Fixed HTTP scheme value in the Consul SD configurations. #6098
+* [BUGFIX] Skip adding shard relabel rules if they were already set in `additionalScrapeConfigs`. #6099
+* [BUGFIX] Fix nil pointer exception when title and text are not set in MS Teams config. #6109
+
 ## 0.69.1 / 2023-11-09
 
 This release is built using Go 1.21.4 which addresses CVE-2023-45283 and CVE-2023-45284.

CONTRIBUTING.md

@@ -42,7 +42,7 @@ are very busy and read the mailing lists.
 The project also holds bi-weekly public meetings where maintainers,
 contributors and users of the Prometheus Operator and kube-prometheus can
 discuss issues, pull requests or any topic related to the projects. The
-meetings happen at 09:00 UTC on Monday, check the [online
+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.