-
Notifications
You must be signed in to change notification settings - Fork 399
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
Trying to pass OLM CI #1387
Merged
Merged
Trying to pass OLM CI #1387
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
e537d52
add maxOpenshiftVersion
NissesSenap 47d81ec
make olm CI pass
NissesSenap 7ec27d0
add make description
NissesSenap 16afbf2
add maintainers
NissesSenap 245365b
Merge branch 'master' into olm_fixes
NissesSenap 484d2ac
change to grafana email
NissesSenap 293f2ab
use hack to add annotations
NissesSenap e92f794
replaces 5.6.0
NissesSenap File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -95,12 +95,13 @@ metadata: | |
| capabilities: Basic Install | ||
| categories: Monitoring | ||
| containerImage: ghcr.io/grafana/grafana-operator@sha256:97561cef949b58f55ec67d133c02ac205e2ec3fb77388aeb868dacfcebad0752 | ||
| createdAt: "2024-01-22T07:16:13Z" | ||
| createdAt: "2024-01-22T12:15:51Z" | ||
| description: Deploys and manages Grafana instances, dashboards and data sources | ||
| operators.operatorframework.io/builder: operator-sdk-v1.32.0 | ||
| operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 | ||
| repository: https://github.com/grafana/grafana-operator | ||
| support: Grafana Labs | ||
| name: grafana-operator.v5.6.0 | ||
| name: grafana-operator.v5.6.1 | ||
| namespace: placeholder | ||
| spec: | ||
| apiservicedefinitions: {} | ||
|
|
@@ -332,7 +333,7 @@ spec: | |
| valueFrom: | ||
| fieldRef: | ||
| fieldPath: metadata.annotations['olm.targetNamespaces'] | ||
| image: ghcr.io/grafana/grafana-operator@sha256:97561cef949b58f55ec67d133c02ac205e2ec3fb77388aeb868dacfcebad0752 | ||
| image: ghcr.io/grafana/grafana-operator@sha256:49ed7bdbae0b9a43e31df2e8ad2baad07042cf098d3c5944c4ce96e20a296695 | ||
| imagePullPolicy: Always | ||
| livenessProbe: | ||
| httpGet: | ||
|
|
@@ -415,17 +416,26 @@ spec: | |
| links: | ||
| - name: Grafana Operator | ||
| url: https://grafana.github.io/grafana-operator | ||
| maintainers: | ||
| - email: [email protected] | ||
| name: Peter Braun | ||
| - email: [email protected] | ||
| name: Hubert Stefanski | ||
| - email: [email protected] | ||
| name: Edvin Norling | ||
| - email: [email protected] | ||
| name: Igor Beliakov | ||
| maturity: stable | ||
| minKubeVersion: 1.23.0 | ||
| provider: | ||
| name: Grafana Labs | ||
| url: https://grafana.com | ||
| relatedImages: | ||
| - image: docker.io/grafana/grafana@sha256:ff68ed4324e471ffa269aa5308cdcf12276ef2d5a660daea95db9d629a32a7d8 | ||
| name: grafana | ||
| - image: ghcr.io/grafana/grafana-operator@sha256:97561cef949b58f55ec67d133c02ac205e2ec3fb77388aeb868dacfcebad0752 | ||
| - image: ghcr.io/grafana/grafana-operator@sha256:49ed7bdbae0b9a43e31df2e8ad2baad07042cf098d3c5944c4ce96e20a296695 | ||
| name: manager | ||
| - image: ghcr.io/grafana/grafana-operator@sha256:97561cef949b58f55ec67d133c02ac205e2ec3fb77388aeb868dacfcebad0752 | ||
| name: grafana-operator-97561cef949b58f55ec67d133c02ac205e2ec3fb77388aeb868dacfcebad0752-annotation | ||
| - image: docker.io/grafana/grafana@sha256:ff68ed4324e471ffa269aa5308cdcf12276ef2d5a660daea95db9d629a32a7d8 | ||
| name: grafana | ||
| replaces: grafana-operator.v5.5.2 | ||
| version: 5.6.0 | ||
| version: 5.6.1 | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| properties: | ||
| - type: olm.maxOpenShiftVersion | ||
| value: | ||
| version: "4.60" | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,6 +7,7 @@ metadata: | |
| categories: Monitoring | ||
| containerImage: ghcr.io/grafana/grafana-operator:v5.6.0 | ||
| createdAt: "2023-12-11T09:21:22Z" | ||
| description: Deploys and manages Grafana instances, dashboards and data sources | ||
| repository: https://github.com/grafana/grafana-operator | ||
| support: Grafana Labs | ||
| name: grafana-operator.v0.0.0 | ||
|
|
@@ -60,6 +61,15 @@ spec: | |
| links: | ||
| - name: Grafana Operator | ||
| url: https://grafana.github.io/grafana-operator | ||
| maintainers: | ||
| - email: [email protected] | ||
| name: Peter Braun | ||
| - email: [email protected] | ||
| name: Hubert Stefanski | ||
| - email: [email protected] | ||
| name: Edvin Norling | ||
| - email: [email protected] | ||
| name: Igor Beliakov | ||
NissesSenap marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| maturity: stable | ||
| minKubeVersion: 1.23.0 | ||
| provider: | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It seems like
olm.maxOpenShiftVersionis not the same ascom.redhat.openshift.versions: "v4.6-v4.8"I guess i missunderstood the docs https://docs.openshift.com/container-platform/4.8/operators/operator_sdk/osdk-working-bundle-images.html
I will play with this later