Skip to content

Commit

Permalink
Merge pull request #926 from NissesSenap/addpot_to_v4
Browse files Browse the repository at this point in the history
Adopt to v4
  • Loading branch information
pb82 committed Mar 17, 2023
2 parents 8bed473 + b71abee commit 04f7f1f
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/kind-e2e.yaml
Expand Up @@ -2,9 +2,9 @@ name: KinD End-to-End

on:
pull_request:
branches: [master]
branches: [v4]
push:
branches: [master]
branches: [v4]

env:
NAME: grafana-operator
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/pr-validation.yaml
@@ -1,6 +1,9 @@
name: PR Validation

on: pull_request
on:
pull_request:
branches:
- v4

env:
NAME: "grafana-operator"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Expand Up @@ -3,7 +3,7 @@ name: Release container
on:
push:
tags:
- "*"
- "v4.*"

jobs:
container-images:
Expand Down
4 changes: 4 additions & 0 deletions README.md
Expand Up @@ -2,6 +2,10 @@

An operator to provision and manage Grafana Instances, Dashboards, Datasources and notification channels. Based on the [Operator-SDK](https://sdk.operatorframework.io/)

Version 5 of the operator is now located in the master branch of the operator.
Version 4 is located in the v4 branch. For more information on how version 4 is supported,
please look at the [official documentation](https://grafana-operator.github.io/grafana-operator/).

## Companies and teams that trust and use the Grafana operator

| Company | Logo | Company | Logo
Expand Down

0 comments on commit 04f7f1f

Please sign in to comment.