Skip to content

Commit

Permalink
chore(operator): CI fix image builing (#14884)
Browse files Browse the repository at this point in the history
  • Loading branch information
JoaoBraveCoding authored Nov 13, 2024
1 parent b726833 commit a4e33e0
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/operator-release-please.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ on:
permissions:
contents: write
pull-requests: write
# Necessary for grafana/shared-workflows/actions/dockerhub-login@main
id-token: write

jobs:
releasePlease:
Expand Down
5 changes: 3 additions & 2 deletions operator/docs/operator/release.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ The following sub-section contains some notes on the Loki operator release-pleas
- Use of `draft`;
- Preventing merging the release-please PR without updating the manifests;

#### Use of `bump-minor-pre-major` and `bump-patch-for-minor-pre-major`
#### Use of `bump-minor-pre-major` and `bump-patch-for-minor-pre-major`

Since the operator is still pre `v1.0.0` we are leveraging `bump-minor-pre-major` and `bump-patch-for-minor-pre-major` so that merging "feat", "fix", and "deps" commits will only bump a patch version and merging "feat!" and "fix!" will bump the minor version.

Expand Down Expand Up @@ -77,4 +77,5 @@ This workflow will then use a workflow `.github/workflows/operator-reusable-hub-
1. Create a PR to bump the version (i.e [v0.6.1 preparation PR](https://github.com/grafana/loki/pull/13105)), be careful with the commit message;
2. Re-trigger the action `operator-publish-operator-hub` on the release-please PR;
3. Merge the release-please PR (i.e [v0.6.1 release PR](https://github.com/grafana/loki/pull/12593) );
4. Grafana bot will automatically open a PRs to [k8s-operatorhub/community-operators](https://github.com/k8s-operatorhub/community-operators) and [redhat-openshift-ecosystem/community-operators-prod](https://github.com/redhat-openshift-ecosystem/community-operators-prod);
4. Grafana bot will build and push the release images to `grafana/loki-operator` ([docker repo](https://hub.docker.com/r/grafana/loki-operator/tags));
5. Grafana bot will automatically open a PRs to [k8s-operatorhub/community-operators](https://github.com/k8s-operatorhub/community-operators) and [redhat-openshift-ecosystem/community-operators-prod](https://github.com/redhat-openshift-ecosystem/community-operators-prod);

0 comments on commit a4e33e0

Please sign in to comment.