Skip to content
This repository was archived by the owner on Jun 19, 2021. It is now read-only.

Commit a1d9263

Browse files
author
LuciferInLove
committed
grafana-operator version updated to 3.6.0
1 parent 613deec commit a1d9263

20 files changed

+430
-112
lines changed

‎.editorconfig

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# EditorConfig is awesome: https://EditorConfig.org
2+
root = true
3+
4+
[*]
5+
indent_style = space
6+
indent_size = 2
7+
end_of_line = lf
8+
charset = utf-8
9+
trim_trailing_whitespace = true
10+
insert_final_newline = true
11+
12+
[{*.md,*.md.gotmpl}]
13+
max_line_length = 0
14+
trim_trailing_whitespace = false
15+
16+
[{Makefile,*.sh}]
17+
indent_size = 6
18+
indent_style = tab

‎.gitattributes

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
*.tpl linguist-language=Go
2+
*.gotmpl linguist-language=Go
3+
4+
*.png binary
5+
*.jpg binary
6+
*.jpeg binary
7+
*.gif binary
8+
*.tif binary
9+
*.tiff binary
10+
*.ico binary

‎.gitignore

+146-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,148 @@
1+
# It's better to unpack these files and commit the raw source because
2+
# git has its own built in compression methods.
3+
*.7z
4+
*.jar
5+
*.rar
16
*.zip
7+
*.gz
8+
*.gzip
29
*.tgz
3-
*.tar.gz
4-
*.tar.xz
10+
*.bzip
11+
*.bzip2
12+
*.bz2
13+
*.xz
14+
*.lzma
15+
*.cab
16+
*.xar
17+
18+
# Packing-only formats
19+
*.iso
20+
*.tar
21+
22+
# Package management formats
23+
*.dmg
24+
*.xpi
25+
*.gem
26+
*.egg
27+
*.deb
28+
*.rpm
29+
*.msi
30+
*.msm
31+
*.msp
32+
*.txz
33+
34+
# Backups
35+
*.backup
36+
*.bak
37+
*.gho
38+
*.ori
39+
*.orig
40+
*.tmp
41+
42+
# Git
43+
*.patch
44+
*.diff
45+
46+
# Linux
47+
*~
48+
49+
# temporary files which can be created if a process still has a handle open of a deleted file
50+
.fuse_hidden*
51+
52+
# KDE directory preferences
53+
.directory
54+
55+
# Linux trash folder which might appear on any partition or disk
56+
.Trash-*
57+
58+
# .nfs files are created when an open file is removed but is still being accessed
59+
.nfs*
60+
61+
# macOS
62+
# General
63+
.DS_Store
64+
.AppleDouble
65+
.LSOverride
66+
67+
# Icon must end with two \r
68+
Icon
69+
70+
# Thumbnails
71+
._*
72+
73+
# Files that might appear in the root of a volume
74+
.DocumentRevisions-V100
75+
.fseventsd
76+
.Spotlight-V100
77+
.TemporaryItems
78+
.Trashes
79+
.VolumeIcon.icns
80+
.com.apple.timemachine.donotpresent
81+
82+
# Directories potentially created on remote AFP share
83+
.AppleDB
84+
.AppleDesktop
85+
Network Trash Folder
86+
Temporary Items
87+
.apdisk
88+
89+
# VisualStudioCode
90+
.vscode/*
91+
!.vscode/settings.json
92+
!.vscode/tasks.json
93+
!.vscode/launch.json
94+
!.vscode/extensions.json
95+
*.code-workspace
96+
97+
# Local History for Visual Studio Code
98+
.history/
99+
100+
# Windows thumbnail cache files
101+
Thumbs.db
102+
Thumbs.db:encryptable
103+
ehthumbs.db
104+
ehthumbs_vista.db
105+
106+
# Dump file
107+
*.stackdump
108+
109+
# Folder config file
110+
[Dd]esktop.ini
111+
112+
# Recycle Bin used on file shares
113+
$RECYCLE.BIN/
114+
115+
# Windows Installer files
116+
*.cab
117+
*.msi
118+
*.msix
119+
*.msm
120+
*.msp
121+
122+
# Windows shortcuts
123+
*.lnk
124+
125+
# Ansible
126+
*.retry
127+
128+
# Vim
129+
130+
# Swap
131+
[._]*.s[a-v][a-z]
132+
!*.svg # comment out if you don't need vector files
133+
[._]*.sw[a-p]
134+
[._]s[a-rt-v][a-z]
135+
[._]ss[a-gi-z]
136+
[._]sw[a-p]
137+
138+
# Session
139+
Session.vim
140+
Sessionx.vim
141+
142+
# Temporary
143+
.netrwhist
144+
*~
145+
# Auto-generated tag files
146+
tags
147+
# Persistent undo
148+
[._]*.un~

‎.helmignore

+65-16
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,72 @@
1-
# Patterns to ignore when building packages.
2-
# This supports shell glob matching, relative path matching, and
3-
# negation (prefixed with !). Only one pattern per line.
4-
.DS_Store
5-
# Common VCS dirs
6-
.git/
1+
# VCS
2+
.git
3+
.gitattributes
74
.gitignore
8-
.bzr/
9-
.bzrignore
10-
.hg/
11-
.hgignore
12-
.svn/
13-
# Common backup files
14-
*.swp
5+
.gitkeep
6+
.gitlab-ci.yml
7+
.pre-commit-config.yaml
8+
9+
# Docker
10+
.dockerignore
11+
docker/
12+
Dockerfile
13+
14+
# helm-docs templates
15+
*.md.gotmpl
16+
17+
# Backups
18+
*.backup
1519
*.bak
20+
*.gho
21+
*.ori
22+
*.orig
1623
*.tmp
17-
*~
24+
25+
# Logs
26+
*.log
27+
1828
# Various IDEs
19-
.vscode
29+
.editorconfig
2030
.project
2131
.idea/
2232
*.tmproj
23-
OWNERS
33+
.vscode/
34+
35+
# Other
36+
resources/
37+
docker/
38+
scripts/
39+
values/
40+
41+
# Linux trash folder
42+
.Trash-*
43+
44+
# macOS
45+
.apdisk
46+
.AppleDB
47+
.AppleDesktop
48+
.AppleDouble
49+
.com.apple.timemachine.donotpresent
50+
.DocumentRevisions-V100
51+
.DS_Store
52+
.fseventsd
53+
.LSOverride
54+
.Spotlight-V100
55+
.TemporaryItems
56+
.Trashes
57+
.VolumeIcon.icns
58+
59+
# Windows
60+
Thumbs.db
61+
Thumbs.db:encryptable
62+
ehthumbs.db
63+
ehthumbs_vista.db
64+
desktop.ini
65+
*RECYCLE.BIN
66+
*.lnk
67+
68+
# Ansible
69+
*.retry
70+
71+
# Other
72+
Makefile

‎Chart.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: v1
22
name: grafana-operator
3-
version: 0.0.1
4-
appVersion: 3.5.0
3+
version: 0.1.0
4+
appVersion: 3.6.0
55
kubeVersion: "^1.8.0-0"
66
description: A Kubernetes Operator based on the Operator SDK for creating and managing Grafana instances.
77
home: https://github.com/integr8ly/grafana-operator

‎README.md

+4-1
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ helm install grafana-operator ./ --namespace grafana
4242
| operator.monitoring.port | string | `http-metrics` | Operator's metrics service port. |
4343
| operator.monitoring.relabelings | list | `[]` | ServiceMonitor endpoint relabelings. |
4444
| grafana[0].name | string | `grafana` | Name of Grafana instance. |
45+
| grafana[0].baseImage | string | `""` | Custom grafana image for the grafana deployment. Warning! This overwrites the `--grafana-image` operator flag. |
4546
| grafana[0].containers | list | `[]` | Additional containers to add to the grafana pod. |
4647
| grafana[0].secrets | list | `[]` | Secrets to be mounted as volume into the grafana deployment. |
4748
| grafana[0].configMaps | list | `[]` | ConfigMaps to be mounted as volume into the grafana deployment. |
@@ -74,6 +75,7 @@ helm install grafana-operator ./ --namespace grafana
7475
| grafana[0].compat | object | `{}` | Grafana's backwards compatibility switches. |
7576
| grafana[0].serviceAccount.annotations | object | `{}` | Additional annotations for ServiceAccount. |
7677
| grafana[0].serviceAccount.labels | object | `{}` | Additional labels for ServiceAccount. |
78+
| grafana[0].serviceAccount.imagePullSecrets | array | `[]` | Additional image pull secrets for ServiceAccount. |
7779
| grafana[0].deployment.replicas | int | `1` | Grafana instance's replicas. |
7880
| grafana[0].deployment.terminationGracePeriodSeconds | string | `""` | Grafana deployment termination grace period. |
7981
| grafana[0].deployment.nodeSelector | object | `{}` | Labels of nodes on which grafana pods are scheduled on. |
@@ -91,5 +93,6 @@ helm install grafana-operator ./ --namespace grafana
9193
| grafana[0].dataStorage.accessModes | list | `[]` | List of the persistent volume access modes. |
9294
| grafana[0].dataStorage.size | string | `""` | Grafana instance's persistent volume size. |
9395
| grafana[0].dataStorage.class | string | `""` | Grafana instance's persistent volume storage class. |
96+
| grafana[0].jsonnet | object | `{}` | Label selector for jsonnet libraries. |
9497
| grafanaDataSource | list | `[]` | List of GrafanaDataSource objects. See an example in values.yaml. |
95-
| grafanaDashboard | list | `[]` | List of GrafanaDashboard objects. See an example in values.yaml. |
98+
| grafanaDashboard | list | `[]` | List of GrafanaDashboard objects. See an example in values.yaml. |

‎crds/grafana.yaml

+13-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,10 @@ spec:
1919
validation:
2020
openAPIV3Schema:
2121
required: ["spec"]
22+
type: object
2223
properties:
2324
spec:
25+
type: object
2426
properties:
2527
containers:
2628
type: array
@@ -127,7 +129,7 @@ spec:
127129
replicas:
128130
type: integer
129131
description: Grafana replicas
130-
nodeSelector:
132+
nodeSelector:
131133
type: object
132134
description: Additional labels for the running grafana pods in a labeled node
133135
tolerations:
@@ -154,6 +156,9 @@ spec:
154156
labels:
155157
type: object
156158
description: Additional labels for the serviceaccount
159+
imagePullSecrets:
160+
type: array
161+
description: Additional image pull secrets for the serviceaccount
157162
client:
158163
type: object
159164
description: Grafana client settings
@@ -187,4 +192,10 @@ spec:
187192
description: Size of persistent volume
188193
class:
189194
type: string
190-
description: Persistent volume storage class
195+
description: Persistent volume storage class
196+
jsonnet:
197+
type: object
198+
description: Jsonnet library configuration
199+
baseImage:
200+
type: string
201+
description: Override base image

‎crds/grafanaDashboard.yaml

+9-1
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,18 @@ spec:
1818
version: v1alpha1
1919
validation:
2020
openAPIV3Schema:
21+
type: object
2122
properties:
2223
spec:
24+
type: object
2325
properties:
2426
name:
2527
type: string
2628
json:
2729
type: string
30+
jsonnet:
31+
description: Jsonnet source. Has access to grafonnet.
32+
type: string
2833
url:
2934
type: string
3035
description: URL to dashboard json
@@ -40,4 +45,7 @@ spec:
4045
type: object
4146
configMapRef:
4247
type: object
43-
description: Dashboards ConfigMap key selector
48+
description: Dashboards ConfigMap key selector
49+
customFolderName:
50+
description: Folder name that this dashboard will be assigned to.
51+
type: string

0 commit comments

Comments
 (0)