Skip to content

Commit

Permalink
Merge pull request #30 from pb82/olm-files
Browse files Browse the repository at this point in the history
add operatorhub bundle files
  • Loading branch information
pb82 authored Jul 24, 2019
2 parents fa23b72 + a322ed7 commit 9adc566
Show file tree
Hide file tree
Showing 17 changed files with 513 additions and 26 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ A Kubernetes Operator based on the Operator SDK for creating and managing Grafan

# Current status

The Operator is functional and can deploy and manage a Grafana instance on Kubernetes and OpenShift. The following features are supported:
The Operator can deploy and manage a Grafana instance on Kubernetes and OpenShift. The following features are supported:

* Install Grafana to a namespace
* Import Grafana dashboards from the same or other namespaces
Expand Down
3 changes: 3 additions & 0 deletions deploy/crds/Grafana.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@ spec:
config:
type: object
description: Grafana config
createRoute:
type: boolean
description: Create an OpenShift Route instead of Ingress
dashboardLabelSelectors:
type: array
items:
Expand Down
3 changes: 0 additions & 3 deletions deploy/examples/Grafana.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,10 @@ kind: Grafana
metadata:
name: example-grafana
spec:
hostname: "grafana.apps.127.0.0.1.nip.io"
config:
log:
mode: "console"
level: "warn"
dashboards:
versions_to_keep: 2
security:
admin_user: "root"
admin_password: "secret"
Expand Down
23 changes: 23 additions & 0 deletions deploy/examples/GrafanaWithIngressHost.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
apiVersion: integreatly.org/v1alpha1
kind: Grafana
metadata:
name: example-grafana
spec:
hostname: "grafana.apps.127.0.0.1.nip.io"
config:
log:
mode: "console"
level: "warn"
security:
admin_user: "root"
admin_password: "secret"
auth:
disable_login_form: False
disable_signout_menu: True
auth.basic:
enabled: False
auth.anonymous:
enabled: True
dashboardLabelSelector:
- matchExpressions:
- {key: app, operator: In, values: [grafana]}
23 changes: 23 additions & 0 deletions deploy/examples/GrafanaWithRoute.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
apiVersion: integreatly.org/v1alpha1
kind: Grafana
metadata:
name: example-grafana
spec:
createRoute: True
config:
log:
mode: "console"
level: "warn"
security:
admin_user: "root"
admin_password: "secret"
auth:
disable_login_form: False
disable_signout_menu: True
auth.basic:
enabled: False
auth.anonymous:
enabled: True
dashboardLabelSelector:
- matchExpressions:
- {key: app, operator: In, values: [grafana]}
64 changes: 64 additions & 0 deletions deploy/olm-catalog/grafana-operator/1.3.0/Grafana.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
name: grafanas.integreatly.org
spec:
group: integreatly.org
names:
kind: Grafana
listKind: GrafanaList
plural: grafanas
singular: grafana
scope: Namespaced
version: v1alpha1
validation:
openAPIV3Schema:
required: ["spec"]
properties:
spec:
properties:
hostname:
type: string
description: Hostname for the ingress. Optional when --openshift is set
containers:
type: array
items:
type: object
description: Additional container to add to the grafana pod
secrets:
type: array
items:
type: string
description: Secret to be mounted as volume into the grafana deployment
logLevel:
type: string
description: Log level of the grafana instance, defaults to info
adminUser:
type: string
description: Default admin user name
adminPassword:
type: string
description: Default admin password
basicAuth:
type: boolean
description: Basic auth enabled
disableLoginForm:
type: boolean
description: Disable login form
disableSignoutMenu:
type: boolean
description: Disable signout menu
anonymous:
type: boolean
description: Anonymous auth enabled
config:
type: object
description: Grafana config
createRoute:
type: boolean
description: Create an OpenShift Route instead of Ingress
dashboardLabelSelectors:
type: array
items:
type: object
description: Label selector or match expressions
34 changes: 34 additions & 0 deletions deploy/olm-catalog/grafana-operator/1.3.0/GrafanaDashboard.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
name: grafanadashboards.integreatly.org
spec:
group: integreatly.org
names:
kind: GrafanaDashboard
listKind: GrafanaDashboardList
plural: grafanadashboards
singular: grafanadashboard
scope: Namespaced
version: v1alpha1
validation:
openAPIV3Schema:
properties:
status:
properties:
messages:
type: array
items:
description: Dashboard Status Message
type: object
spec:
properties:
name:
type: string
json:
type: string
plugins:
type: array
items:
description: Grafana Plugin Object
type: object
35 changes: 35 additions & 0 deletions deploy/olm-catalog/grafana-operator/1.3.0/GrafanaDataSource.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
name: grafanadatasources.integreatly.org
spec:
group: integreatly.org
names:
kind: GrafanaDataSource
listKind: GrafanaDataSourceList
plural: grafanadatasources
singular: grafanadatasource
scope: Namespaced
version: v1alpha1
validation:
openAPIV3Schema:
properties:
apiVersion:
type: string
kind:
type: string
metadata:
type: object
spec:
required: ["datasources", "name"]
properties:
name:
type: string
minimum: 1
datasources:
type: array
items:
description: Grafana Datasource Object
type: object
status:
type: object
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
packageName: grafana-operator
channels:
- name: alpha
currentCSV: grafana-operator.v1.3.0
Loading

0 comments on commit 9adc566

Please sign in to comment.