Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(release): v0.78.1-rhobs #77

Merged
merged 2 commits into from
Dec 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ body:
attributes:
label: Is there an existing issue for this?
description: |
Before filing a bug, please be sure you have searched through [existing bugs](https://github.com/prometheus-operator/prometheus-operator/issues?q=is%3Aopen+is%3Aissue+label%3Akind%2Fbug) to see if an existing issue covers your bug.
Before filing a bug, please be sure you have searched through [existing bugs](https://github.com/rhobs/obo-prometheus-operator/issues?q=is%3Aopen+is%3Aissue+label%3Akind%2Fbug) to see if an existing issue covers your bug.
options:
- label: I have searched the existing issues
required: true
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ contact_links:
url: https://kubernetes.slack.com/archives/CFFDS2Z7F
about: "Join us for questions, answers or prometheus-operator related chat. Please do create issues on Github for better collaboration. If you don't have an account, sign up at https://kubernetes.slack.com"
- name: "Question via prometheus-operator discussions (similar to Stack Overflow)"
url: https://github.com/prometheus-operator/prometheus-operator/discussions
url: https://github.com/rhobs/obo-prometheus-operator/discussions
about: "Please ask and answer questions here for async response."
6 changes: 3 additions & 3 deletions .github/workflows/e2e-feature-gated.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@ jobs:
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)
kind load docker-image -n e2e quay.io/rhobs/obo-prometheus-operator:$(git rev-parse --short HEAD)
kind load docker-image -n e2e quay.io/rhobs/obo-prometheus-config-reloader:$(git rev-parse --short HEAD)
kind load docker-image -n e2e quay.io/rhobs/obo-admission-webhook:$(git rev-parse --short HEAD)
kubectl apply -f scripts/kind-rbac.yaml
- name: Run tests
run: >
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/e2e-prometheus3.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,9 @@ jobs:
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)
kind load docker-image -n e2e quay.io/rhobs/obo-prometheus-operator:$(git rev-parse --short HEAD)
kind load docker-image -n e2e quay.io/rhobs/obo-prometheus-config-reloader:$(git rev-parse --short HEAD)
kind load docker-image -n e2e quay.io/rhobs/obo-admission-webhook:$(git rev-parse --short HEAD)
kubectl apply -f scripts/kind-rbac.yaml
- name: Run tests
run: >
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,9 @@ jobs:
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)
kind load docker-image -n e2e quay.io/rhobs/obo-prometheus-operator:$(git rev-parse --short HEAD)
kind load docker-image -n e2e quay.io/rhobs/obo-prometheus-config-reloader:$(git rev-parse --short HEAD)
kind load docker-image -n e2e quay.io/rhobs/obo-admission-webhook:$(git rev-parse --short HEAD)
kubectl apply -f scripts/kind-rbac.yaml
- name: Run tests
run: >
Expand Down
63 changes: 0 additions & 63 deletions .github/workflows/publish.yaml

This file was deleted.

38 changes: 0 additions & 38 deletions .github/workflows/release.yaml

This file was deleted.

80 changes: 80 additions & 0 deletions .github/workflows/rhobs-release.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
# This workflow creates a git tag and publishes container images
name: rhobs release
on:
push:
branches:
- 'rhobs-rel-**'

jobs:
debug:
runs-on: ubuntu-latest
if: "!startsWith(github.event.head_commit.message, 'chore(release):')"
steps:
- name: Debug
run: |
echo "Skipping release workflow since commit message does match the convention"

create-release:
runs-on: ubuntu-latest
if: "startsWith(github.event.head_commit.message, 'chore(release):')"
steps:
- name: Checkout
uses: actions/checkout@v3
with:
fetch-depth: 0

- name: Import common environment variables
run: cat ".github/env" >> $GITHUB_ENV

- name: Install Go
uses: actions/setup-go@v3
with:
go-version: '${{ env.golang-version }}'

- name: login to quay.io
uses: docker/login-action@v2
with:
registry: quay.io
username: ${{ secrets.quay_repo_username }}
password: ${{ secrets.quay_repo_password }}

- name: create git tag
id: git_tag
run: |
version="$(head -1 VERSION)"
git config user.name rhobs-release-bot
git config user.email release-bot@monitoring.rhobs.io

git tag -a "v${version}" -m "v${version}"
git tag -a "pkg/apis/monitoring/v${version}" -m "v${version}"
git tag -a "pkg/client/v${version}" -m "v${version}"


- name: Build RHOBS images and push
env:
IMAGE_ORG: ${{ secrets.IMAGE_ORG }}
run: |
REGISTRIES="quay.io" \
IMAGE_ORG=$IMAGE_ORG \
CPU_ARCHS="amd64" \
TAG="v$(head -1 VERSION)" \
./rhobs/push-container-images.sh

cd rhobs/olm
make tools
make bundle-image bundle-push IMAGE_REPO=quay.io/$IMAGE_ORG

- name: push git tags
run: |
git push --tags

- name: test if rhobs fork can be imported
run: |
[[ "$IMAGE_ORG" != "rhobs" ]] && {
echo "Skipping import tests on forked repos"
exit 0
}

cd rhobs/test/import
go mod tidy
go test ./...
21 changes: 0 additions & 21 deletions .github/workflows/stale.yaml

This file was deleted.

6 changes: 3 additions & 3 deletions .github/workflows/test-prom-version-upgrade.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ jobs:
kubectl get pods -A
- 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)
kind load docker-image -n e2e quay.io/rhobs/obo-prometheus-operator:$(git rev-parse --short HEAD)
kind load docker-image -n e2e quay.io/rhobs/obo-prometheus-config-reloader:$(git rev-parse --short HEAD)
kind load docker-image -n e2e quay.io/rhobs/obo-admission-webhook:$(git rev-parse --short HEAD)
kubectl apply -f scripts/kind-rbac.yaml
- name: Run tests
run: >
Expand Down
2 changes: 1 addition & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ linters-settings:
sections:
- standard
- default
- prefix(github.com/prometheus-operator/prometheus-operator)
- prefix(github.com/rhobs/obo-prometheus-operator)
depguard:
rules:
forbid-pkg-errors:
Expand Down
4 changes: 2 additions & 2 deletions .mdox.validate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ validators:
- regex: 'https:\/\/github\.com\/prometheus-operator\/prometheus-operator\/releases'
type: "ignore"
# Ignore GitHub container packages link as it returns 404 in curl, but works in browser
- regex: 'https://github.com/prometheus-operator/prometheus-operator/pkgs/container/prometheus-operator'
- regex: 'https://github.com/rhobs/obo-prometheus-operator/pkgs/container/prometheus-operator'
type: "ignore"
# Ignore links to /img/ because the generated content will resolve them correctly.
- regex: '/img/.+'
Expand All @@ -32,7 +32,7 @@ validators:
- regex: 'https:\/\/twitter.com\/PromOperator'
type: ignore
# 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)$'
- regex: 'api\.md#monitoring\.rhobs/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\/)'
Expand Down
2 changes: 1 addition & 1 deletion ADOPTERS.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Details (optional):

This document tracks people and use cases for the Prometheus Operator in production. By creating a list of production use cases we hope to build a community of advisors that we can reach out to with experience using various the Prometheus Operator applications, operation environments, and cluster sizes. The Prometheus Operator development team may reach out periodically to check-in on how the Prometheus Operator is working in the field and update this list.

Go ahead and [add your organization](https://github.com/prometheus-operator/prometheus-operator/edit/main/ADOPTERS.md) to the list.
Go ahead and [add your organization](https://github.com/rhobs/obo-prometheus-operator/edit/main/ADOPTERS.md) to the list.

## AuthZed

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ COPY --from=builder workspace/operator /bin/operator
# On busybox 'nobody' has uid `65534'
USER 65534

LABEL org.opencontainers.image.source="https://github.com/prometheus-operator/prometheus-operator" \
LABEL org.opencontainers.image.source="https://github.com/rhobs/obo-prometheus-operator" \
org.opencontainers.image.url="https://prometheus-operator.dev/" \
org.opencontainers.image.documentation="https://prometheus-operator.dev/" \
org.opencontainers.image.licenses="Apache-2.0"
Expand Down
4 changes: 2 additions & 2 deletions Documentation/additional-scrape-config.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ kubectl apply -f additional-scrape-configs.yaml -n monitoring
Finally, reference this additional configuration in your `prometheus.yaml` CRD.

```yaml
apiVersion: monitoring.coreos.com/v1
apiVersion: monitoring.rhobs/v1
kind: Prometheus
metadata:
name: prometheus
Expand All @@ -61,5 +61,5 @@ NOTE: Use only one secret for ALL additional scrape configurations.

## Additional References

* [Prometheus Spec](api.md#monitoring.coreos.com/v1.PrometheusSpec)
* [Prometheus Spec](api.md#monitoring.rhobs/v1.PrometheusSpec)
* [Additional Scrape Configs](../example/additional-scrape-configs)
Loading
Loading