Skip to content

Commit

Permalink
Merge branch 'master' into docs/alerting-proposal
Browse files Browse the repository at this point in the history
  • Loading branch information
@NissesSenap
NissesSenap committed Dec 28, 2023
2 parents 484e596 + 8bb14a2 commit 1297ef3
Show file tree
Hide file tree
Showing 13 changed files with 1,614 additions and 184 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/e2e.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
fetch-depth: 0
- id: changed-files
name: Get changed files
uses: tj-actions/changed-files@94549999469dbfa032becf298d95c87a14c34394 #v40.2.2
uses: tj-actions/changed-files@716b1e13042866565e00e85fd4ec490e186c4a2f #v41.0.1
with:
files_ignore: |
**/*.md
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/hugo.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
--minify \
--baseURL "${{ steps.pages.outputs.base_url }}/"
- name: Upload artifact
uses: actions/upload-pages-artifact@v2
uses: actions/upload-pages-artifact@v3
with:
path: ./hugo/public

Expand All @@ -72,4 +72,4 @@ jobs:
steps:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v3
uses: actions/deploy-pages@v4
2 changes: 1 addition & 1 deletion .github/workflows/pr-validation.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- name: Clone the code
uses: actions/checkout@v4 #v3.2.0
- name: reviewdog
uses: reviewdog/action-setup@80a06617492b461a66508e2dedf16233f0506804 # v1.0.6
uses: reviewdog/action-setup@154bb4214db7d87bdb814a346ec67b3472fe1c5f # v1.1.0
with:
reviewdog_version: latest

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: install flux
uses: fluxcd/flux2/action@v2.2.1
uses: fluxcd/flux2/action@v2.2.2
- name: Clone repo
uses: actions/checkout@v4

Expand Down
4 changes: 2 additions & 2 deletions bundle/manifests/grafana-operator.clusterserviceversion.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,14 +88,14 @@ metadata:
"dashboards": "grafana-a"
}
},
"json": "{\n\n \"uid\": \"nErXDvCkzz\",\n \"title\": \"Example Folder\"\n}"
"title": "Example Folder"
}
}
]
capabilities: Basic Install
categories: Monitoring
containerImage: ghcr.io/grafana/grafana-operator@sha256:97561cef949b58f55ec67d133c02ac205e2ec3fb77388aeb868dacfcebad0752
createdAt: "2023-12-12T08:04:09Z"
createdAt: "2023-12-20T15:40:51Z"
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
Expand Down
139 changes: 127 additions & 12 deletions config/crd/bases/grafana.integreatly.org_grafanas.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,16 @@ spec:
type: object
type: object
x-kubernetes-map-type: atomic
matchLabelKeys:
items:
type: string
type: array
x-kubernetes-list-type: atomic
mismatchLabelKeys:
items:
type: string
type: array
x-kubernetes-list-type: atomic
namespaceSelector:
properties:
matchExpressions:
Expand Down Expand Up @@ -336,6 +346,16 @@ spec:
type: object
type: object
x-kubernetes-map-type: atomic
matchLabelKeys:
items:
type: string
type: array
x-kubernetes-list-type: atomic
mismatchLabelKeys:
items:
type: string
type: array
x-kubernetes-list-type: atomic
namespaceSelector:
properties:
matchExpressions:
Expand Down Expand Up @@ -402,6 +422,16 @@ spec:
type: object
type: object
x-kubernetes-map-type: atomic
matchLabelKeys:
items:
type: string
type: array
x-kubernetes-list-type: atomic
mismatchLabelKeys:
items:
type: string
type: array
x-kubernetes-list-type: atomic
namespaceSelector:
properties:
matchExpressions:
Expand Down Expand Up @@ -470,6 +500,16 @@ spec:
type: object
type: object
x-kubernetes-map-type: atomic
matchLabelKeys:
items:
type: string
type: array
x-kubernetes-list-type: atomic
mismatchLabelKeys:
items:
type: string
type: array
x-kubernetes-list-type: atomic
namespaceSelector:
properties:
matchExpressions:
Expand Down Expand Up @@ -649,6 +689,14 @@ spec:
required:
- port
type: object
sleep:
properties:
seconds:
format: int64
type: integer
required:
- seconds
type: object
tcpSocket:
properties:
host:
Expand Down Expand Up @@ -699,6 +747,14 @@ spec:
required:
- port
type: object
sleep:
properties:
seconds:
format: int64
type: integer
required:
- seconds
type: object
tcpSocket:
properties:
host:
Expand Down Expand Up @@ -1293,6 +1349,14 @@ spec:
required:
- port
type: object
sleep:
properties:
seconds:
format: int64
type: integer
required:
- seconds
type: object
tcpSocket:
properties:
host:
Expand Down Expand Up @@ -1343,6 +1407,14 @@ spec:
required:
- port
type: object
sleep:
properties:
seconds:
format: int64
type: integer
required:
- seconds
type: object
tcpSocket:
properties:
host:
Expand Down Expand Up @@ -1944,6 +2016,14 @@ spec:
required:
- port
type: object
sleep:
properties:
seconds:
format: int64
type: integer
required:
- seconds
type: object
tcpSocket:
properties:
host:
Expand Down Expand Up @@ -1994,6 +2074,14 @@ spec:
required:
- port
type: object
sleep:
properties:
seconds:
format: int64
type: integer
required:
- seconds
type: object
tcpSocket:
properties:
host:
Expand Down Expand Up @@ -2846,18 +2934,6 @@ spec:
type: object
resources:
properties:
claims:
items:
properties:
name:
type: string
required:
- name
type: object
type: array
x-kubernetes-list-map-keys:
- name
x-kubernetes-list-type: map
limits:
additionalProperties:
anyOf:
Expand Down Expand Up @@ -2901,6 +2977,8 @@ spec:
x-kubernetes-map-type: atomic
storageClassName:
type: string
volumeAttributesClassName:
type: string
volumeMode:
type: string
volumeName:
Expand Down Expand Up @@ -3089,6 +3167,43 @@ spec:
sources:
items:
properties:
clusterTrustBundle:
properties:
labelSelector:
properties:
matchExpressions:
items:
properties:
key:
type: string
operator:
type: string
values:
items:
type: string
type: array
required:
- key
- operator
type: object
type: array
matchLabels:
additionalProperties:
type: string
type: object
type: object
x-kubernetes-map-type: atomic
name:
type: string
optional:
type: boolean
path:
type: string
signerName:
type: string
required:
- path
type: object
configMap:
properties:
items:
Expand Down
Loading

0 comments on commit 1297ef3

Please sign in to comment.