Merge pull request #6071 from simonpasquier/cut-0.69.1

chore: cut v0.69.1
prometheus-operator · Nov 9, 2023 · 941b9e9 · 941b9e9
2 parents c465ad0 + f460e7a
commit 941b9e9
Show file tree

Hide file tree

Showing 47 changed files with 89 additions and 71 deletions.
diff --git a/.github/workflows/checks.yaml b/.github/workflows/checks.yaml
@@ -24,6 +24,7 @@ jobs:
     - uses: actions/setup-go@v4
       with:
         go-version: '${{ env.golang-version }}'
+        check-latest: true
     - run: make --always-make format generate && git diff --exit-code
   check-docs:
     runs-on: ubuntu-latest
@@ -35,6 +36,7 @@ jobs:
     - uses: actions/setup-go@v4
       with:
         go-version: '${{ env.golang-version }}'
+        check-latest: true
     - run: make check-docs
   check-golang:
     runs-on: ubuntu-latest
@@ -46,6 +48,7 @@ jobs:
       - uses: actions/setup-go@v4
         with:
           go-version: '${{ env.golang-version }}'
+          check-latest: true
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3.7.0
         with:
@@ -61,6 +64,7 @@ jobs:
     - uses: actions/setup-go@v4
       with:
         go-version: '${{ env.golang-version }}'
+        check-latest: true
     - run: make check-metrics
   build:
     runs-on: ${{ matrix.os }}
@@ -77,6 +81,7 @@ jobs:
     - uses: actions/setup-go@v4
       with:
         go-version: '${{ env.golang-version }}'
+        check-latest: true
     - run: make operator
   po-rule-migration:
     runs-on: ubuntu-latest
@@ -88,5 +93,6 @@ jobs:
     - uses: actions/setup-go@v4
       with:
         go-version: '${{ env.golang-version }}'
+        check-latest: true
     - run: cd cmd/po-rule-migration && go install
 
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
@@ -59,6 +59,7 @@ jobs:
       uses: actions/setup-go@v4
       with:
         go-version: '${{ env.golang-version }}'
+        check-latest: true
     - name: Build images
       run: |
         export SHELL=/bin/bash

diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
@@ -29,6 +29,7 @@ jobs:
         uses: actions/setup-go@v4
         with:
           go-version: '${{ env.golang-version }}'
+          check-latest: true
       - name: Install cosign
         uses: sigstore/cosign-installer@main
       - name: Check the Docker version

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -17,6 +17,7 @@ jobs:
         uses: actions/setup-go@v4
         with:
           go-version: '${{ env.golang-version }}'
+          check-latest: true
       - name: Upload bundle.yaml to release
         uses: svenstaro/upload-release-action@v2
         with:

diff --git a/.github/workflows/test-prom-version-upgrade.yaml b/.github/workflows/test-prom-version-upgrade.yaml
@@ -15,6 +15,7 @@ jobs:
       uses: actions/setup-go@v4
       with:
         go-version: '${{ env.golang-version }}'
+        check-latest: true
     - name: Build images
       run: |
         export SHELL=/bin/bash

diff --git a/.github/workflows/unit.yaml b/.github/workflows/unit.yaml
@@ -19,6 +19,7 @@ jobs:
     - uses: actions/setup-go@v4
       with:
         go-version: '${{ env.golang-version }}'
+        check-latest: true
     - run: make test-unit
   extended-tests:
     runs-on: ubuntu-latest
@@ -30,4 +31,5 @@ jobs:
     - uses: actions/setup-go@v4
       with:
         go-version: ${{ env.golang-version }}
+        check-latest: true
     - run: make test-long
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 0.69.1 / 2023-11-09
+
+This release is built using Go 1.21.4 which addresses CVE-2023-45283 and CVE-2023-45284.
+
+* [BUGFIX] Rename test files to resolve Go import failures of `github.com/prometheus-operator/prometheus-operator`. #6070
+
 ## 0.69.0 / 2023-11-03
 
 * [CHANGE] Consider secret references without `optional` value to be mandatory instead of optional for `.spec.additionalScrapeConfigs` configs. #5985

diff --git a/Documentation/operator.md b/Documentation/operator.md
@@ -64,7 +64,7 @@ Usage of ./operator:
   -namespaces value
     	Namespaces to scope the interaction of the Prometheus Operator and the apiserver (allow list). This is mutually exclusive with --deny-namespaces.
   -prometheus-config-reloader string
-    	Prometheus config reloader image (default "quay.io/prometheus-operator/prometheus-config-reloader:v0.69.0")
+    	Prometheus config reloader image (default "quay.io/prometheus-operator/prometheus-config-reloader:v0.69.1")
   -prometheus-default-base-image string
     	Prometheus default base image (path without tag/version) (default "quay.io/prometheus/prometheus")
   -prometheus-instance-namespaces value

diff --git a/Documentation/rbac.md b/Documentation/rbac.md
@@ -26,7 +26,7 @@ metadata:
   labels:
     app.kubernetes.io/component: controller
     app.kubernetes.io/name: prometheus-operator
-    app.kubernetes.io/version: 0.69.0
+    app.kubernetes.io/version: 0.69.1
   name: prometheus-operator
 rules:
 - apiGroups:
@@ -187,7 +187,7 @@ metadata:
   labels:
     app.kubernetes.io/component: controller
     app.kubernetes.io/name: prometheus-operator
-    app.kubernetes.io/version: 0.69.0
+    app.kubernetes.io/version: 0.69.1
   name: prometheus-operator
   namespace: default
 ```
@@ -203,7 +203,7 @@ metadata:
   labels:
     app.kubernetes.io/component: controller
     app.kubernetes.io/name: prometheus-operator
-    app.kubernetes.io/version: 0.69.0
+    app.kubernetes.io/version: 0.69.1
   name: prometheus-operator
 roleRef:
   apiGroup: rbac.authorization.k8s.io

diff --git a/Documentation/user-guides/prometheus-agent.md b/Documentation/user-guides/prometheus-agent.md
@@ -26,7 +26,7 @@ metadata:
   labels:
     app.kubernetes.io/component: controller
     app.kubernetes.io/name: prometheus-operator
-    app.kubernetes.io/version: 0.69.0
+    app.kubernetes.io/version: 0.69.1
   name: prometheus-operator
 rules:
 - apiGroups:

diff --git a/Documentation/user-guides/webhook.md b/Documentation/user-guides/webhook.md
@@ -86,7 +86,7 @@ kind: ServiceAccount
 metadata:
   labels:
     app.kubernetes.io/name: prometheus-operator-admission-webhook
-    app.kubernetes.io/version: 0.69.0
+    app.kubernetes.io/version: 0.69.1
   name: prometheus-operator-admission-webhook
   namespace: default
 ```
@@ -97,7 +97,7 @@ kind: Deployment
 metadata:
   labels:
     app.kubernetes.io/name: prometheus-operator-admission-webhook
-    app.kubernetes.io/version: 0.69.0
+    app.kubernetes.io/version: 0.69.1
   name: prometheus-operator-admission-webhook
   namespace: default
 spec:
@@ -114,7 +114,7 @@ spec:
         kubectl.kubernetes.io/default-container: prometheus-operator-admission-webhook
       labels:
         app.kubernetes.io/name: prometheus-operator-admission-webhook
-        app.kubernetes.io/version: 0.69.0
+        app.kubernetes.io/version: 0.69.1
     spec:
       affinity:
         podAntiAffinity:
@@ -131,7 +131,7 @@ spec:
         - --web.enable-tls=true
         - --web.cert-file=/etc/tls/private/tls.crt
         - --web.key-file=/etc/tls/private/tls.key
-        image: quay.io/prometheus-operator/admission-webhook:v0.69.0
+        image: quay.io/prometheus-operator/admission-webhook:v0.69.1
         name: prometheus-operator-admission-webhook
         ports:
         - containerPort: 8443
@@ -179,7 +179,7 @@ kind: Service
 metadata:
   labels:
     app.kubernetes.io/name: prometheus-operator-admission-webhook
-    app.kubernetes.io/version: 0.69.0
+    app.kubernetes.io/version: 0.69.1
   name: prometheus-operator-admission-webhook
   namespace: default
 spec:

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.69.0
+0.69.1
diff --git a/bundle.yaml b/bundle.yaml
diff --git a/example/admission-webhook/deployment.yaml b/example/admission-webhook/deployment.yaml
@@ -3,7 +3,7 @@ kind: Deployment
 metadata:
   labels:
     app.kubernetes.io/name: prometheus-operator-admission-webhook
-    app.kubernetes.io/version: 0.69.0
+    app.kubernetes.io/version: 0.69.1
   name: prometheus-operator-admission-webhook
   namespace: default
 spec:
@@ -20,7 +20,7 @@ spec:
         kubectl.kubernetes.io/default-container: prometheus-operator-admission-webhook
       labels:
         app.kubernetes.io/name: prometheus-operator-admission-webhook
-        app.kubernetes.io/version: 0.69.0
+        app.kubernetes.io/version: 0.69.1
     spec:
       affinity:
         podAntiAffinity:
@@ -37,7 +37,7 @@ spec:
         - --web.enable-tls=true
         - --web.cert-file=/etc/tls/private/tls.crt
         - --web.key-file=/etc/tls/private/tls.key
-        image: quay.io/prometheus-operator/admission-webhook:v0.69.0
+        image: quay.io/prometheus-operator/admission-webhook:v0.69.1
         name: prometheus-operator-admission-webhook
         ports:
         - containerPort: 8443

diff --git a/example/admission-webhook/pod-disruption-budget.yaml b/example/admission-webhook/pod-disruption-budget.yaml
@@ -3,7 +3,7 @@ kind: PodDisruptionBudget
 metadata:
   labels:
     app.kubernetes.io/name: prometheus-operator-admission-webhook
-    app.kubernetes.io/version: 0.69.0
+    app.kubernetes.io/version: 0.69.1
   name: prometheus-operator-admission-webhook
   namespace: default
 spec:

diff --git a/example/admission-webhook/service-account.yaml b/example/admission-webhook/service-account.yaml
@@ -4,6 +4,6 @@ kind: ServiceAccount
 metadata:
   labels:
     app.kubernetes.io/name: prometheus-operator-admission-webhook
-    app.kubernetes.io/version: 0.69.0
+    app.kubernetes.io/version: 0.69.1
   name: prometheus-operator-admission-webhook
   namespace: default