diff --git a/deploy/olm-catalog/grafana-operator/3.x.x/3.10.2/grafana-operator.v3.10.2.clusterserviceversion.yaml b/deploy/olm-catalog/grafana-operator/3.x.x/3.10.2/grafana-operator.v3.10.2.clusterserviceversion.yaml new file mode 100644 index 000000000..0a577c5cf --- /dev/null +++ b/deploy/olm-catalog/grafana-operator/3.x.x/3.10.2/grafana-operator.v3.10.2.clusterserviceversion.yaml @@ -0,0 +1,221 @@ +apiVersion: operators.coreos.com/v1alpha1 +kind: ClusterServiceVersion +metadata: + annotations: + alm-examples: "[\n{\n \"apiVersion\": \"integreatly.org/v1alpha1\",\n \"kind\"\ + : \"Grafana\",\n \"metadata\": {\n \"name\": \"example-grafana\"\n },\n\ + \ \"spec\": {\n \"ingress\": {\n \"enabled\": true\n },\n \"\ + config\": {\n \"auth\": {\n \"disable_signout_menu\": true\n \ + \ },\n \"auth.anonymous\": {\n \"enabled\": true\n },\n \ + \ \"log\": {\n \"level\": \"warn\",\n \"mode\": \"console\"\ + \n },\n \"security\": {\n \"admin_password\": \"secret\",\n\ + \ \"admin_user\": \"root\"\n }\n },\n \"dashboardLabelSelector\"\ + : [\n {\n \"matchExpressions\": [\n {\n \"key\": \"app\"\ + ,\n \"operator\": \"In\",\n \"values\": [\n \"grafana\"\ + \n ]\n }\n ]\n }\n ]\n }\n},\n{\n \"apiVersion\": \"\ + integreatly.org/v1alpha1\",\n \"kind\": \"GrafanaDashboard\",\n \"metadata\"\ + : {\n \"labels\": {\n \"app\": \"grafana\"\n },\n \"name\": \"\ + simple-dashboard\"\n },\n \"spec\": {\n \"json\": \"{\\n \\\"id\\\": null,\\\ + n \\\"title\\\": \\\"Simple Dashboard\\\",\\n \\\"tags\\\": [],\\n \\\"style\\\ + \": \\\"dark\\\",\\n \\\"timezone\\\": \\\"browser\\\",\\n \\\"editable\\\"\ + : true,\\n \\\"hideControls\\\": false,\\n \\\"graphTooltip\\\": 1,\\n \\\ + \"panels\\\": [],\\n \\\"time\\\": {\\n \\\"from\\\": \\\"now-6h\\\",\\\ + n \\\"to\\\": \\\"now\\\"\\n },\\n \\\"timepicker\\\": {\\n \\\"time_options\\\ + \": [],\\n \\\"refresh_intervals\\\": []\\n },\\n \\\"templating\\\": {\\\ + n \\\"list\\\": []\\n },\\n \\\"annotations\\\": {\\n \\\"list\\\":\ + \ []\\n },\\n \\\"refresh\\\": \\\"5s\\\",\\n \\\"schemaVersion\\\": 17,\\\ + n \\\"version\\\": 0,\\n \\\"links\\\": []\\n}\\n\",\n \"name\": \"simple-dashboard.json\"\ + \n }\n},\n{\n \"apiVersion\": \"integreatly.org/v1alpha1\",\n \"kind\": \"\ + GrafanaDataSource\",\n \"metadata\": {\n \"name\": \"example-grafanadatasource\"\ + \n },\n \"spec\": {\n \"datasources\": [\n {\n \"access\": \"proxy\"\ + ,\n \"editable\": true,\n \"isDefault\": true,\n \"jsonData\"\ + : {\n \"timeInterval\": \"5s\"\n },\n \"name\": \"Prometheus\"\ + ,\n \"type\": \"prometheus\",\n \"url\": \"http://prometheus-service:9090\"\ + ,\n \"version\": 1\n }\n ],\n \"name\": \"example-datasources.yaml\"\ + \n }\n}\n]" + capabilities: Basic Install + categories: Monitoring + certified: 'False' + containerImage: quay.io/integreatly/grafana-operator:v3.10.2 + createdAt: 2020-07-31 00:00:00 + description: An Operator for managing Grafana instances, dashboards and data sources + repository: https://github.com/integr8ly/grafana-operator + support: Red Hat + name: grafana-operator.v3.10.2 + namespace: placeholder +spec: + apiservicedefinitions: { } + customresourcedefinitions: + owned: + - description: Represents a Grafana Instance + displayName: Grafana + kind: Grafana + name: grafanas.integreatly.org + version: v1alpha1 + - description: Represents a Grafana Dashboard + displayName: Grafana Dashboard + kind: GrafanaDashboard + name: grafanadashboards.integreatly.org + version: v1alpha1 + - description: Represents a Grafana Data Source + displayName: Grafana Data Source + kind: GrafanaDataSource + name: grafanadatasources.integreatly.org + version: v1alpha1 + description: 'A Kubernetes Operator based on the Operator SDK for creating and managing + Grafana instances. + + + Grafana is an open platform for beautiful analytics and monitoring. For more information + please visit the [Grafana website](https://grafana.com) + + + # Current status + + + The Operator can deploy and manage a Grafana instance on Kubernetes and OpenShift. + The following features are supported: + + + * Install Grafana to a namespace + + * Configure Grafana through the custom resource + + * Import Grafana dashboards from the same or other namespaces + + * Import Grafana data sources from the same namespace + + * Install Plugins (panels) + + ' + displayName: Grafana Operator + icon: + - base64data: <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Generator: Adobe Illustrator 20.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->

<svg
   xmlns:dc="http://purl.org/dc/elements/1.1/"
   xmlns:cc="http://creativecommons.org/ns#"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns:svg="http://www.w3.org/2000/svg"
   xmlns="http://www.w3.org/2000/svg"
   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   version="1.1"
   id="Layer_1"
   x="0px"
   y="0px"
   width="57.799999"
   height="57.799999"
   viewBox="0 0 57.799999 57.8"
   xml:space="preserve"
   sodipodi:docname="logo_small.svg"
   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"><metadata
   id="metadata3785"><rdf:RDF><cc:Work
       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
   id="defs3783" /><sodipodi:namedview
   pagecolor="#ffffff"
   bordercolor="#666666"
   borderopacity="1"
   objecttolerance="10"
   gridtolerance="10"
   guidetolerance="10"
   inkscape:pageopacity="0"
   inkscape:pageshadow="2"
   inkscape:window-width="2560"
   inkscape:window-height="1386"
   id="namedview3781"
   showgrid="false"
   inkscape:zoom="13.858714"
   inkscape:cx="75.412904"
   inkscape:cy="23.077606"
   inkscape:window-x="0"
   inkscape:window-y="0"
   inkscape:window-maximized="1"
   inkscape:current-layer="Layer_1" />
<style
   type="text/css"
   id="style3769">
	.st0{fill:#E6E7E8;}
	.st1{fill:url(#SVGID_1_);}
</style>

<linearGradient
   id="SVGID_1_"
   gradientUnits="userSpaceOnUse"
   x1="26.700001"
   y1="-9.8501997"
   x2="26.700001"
   y2="43.166"
   gradientTransform="matrix(1,0,0,-1,2,60.000002)">
	<stop
   offset="0"
   style="stop-color:#FFF100"
   id="stop3773" />
	<stop
   offset="1"
   style="stop-color:#F05A28"
   id="stop3775" />
</linearGradient>
<path
   class="st1"
   d="m 55.1,25.500002 c -0.1,-1 -0.3,-2.1 -0.6,-3.3 -0.3,-1.2 -0.8,-2.6 -1.5,-4 -0.7,-1.4 -1.6,-2.9 -2.8,-4.3 -0.5,-0.6 -1,-1.1 -1.5,-1.6 0.8,-3.2000004 -1,-6.0000004 -1,-6.0000004 -3.1,-0.2 -5.1,1 -5.8,1.5 -0.1,-0.1 -0.2,-0.1 -0.4,-0.2 -0.5,-0.2 -1,-0.4 -1.6,-0.6 -0.6,-0.2 -1.1,-0.3 -1.7,-0.5 -0.6,-0.1 -1.2,-0.3 -1.8,-0.3 -0.1,0 -0.2,0 -0.3,0 C 34.8,1.8000016 30.9,1.5258789e-6 30.9,1.5258789e-6 26.6,2.8000016 25.7,6.6000016 25.7,6.6000016 c 0,0 0,0.1 0,0.2 -0.2,0.1 -0.5,0.1 -0.7,0.2 -0.3,0.1 -0.7,0.2 -1,0.3 -0.3,0.1 -0.7,0.3 -1,0.4 -0.7,0.3 -1.3,0.6 -1.9,1 -0.6,0.3 -1.2,0.7 -1.8,1.1 -0.1,0 -0.2,-0.1 -0.2,-0.1 -6,-2.3 -11.4,0.5000004 -11.4,0.5000004 -0.5,6.4 2.4,10.4 3,11.2 -0.1,0.4 -0.3,0.8 -0.4,1.2 -0.4,1.4 -0.8,2.9 -1,4.5 0,0.2 -0.1,0.4 -0.1,0.7 -5.6,2.7 -7.2,8.4 -7.2,8.4 4.6,5.3 10,5.7 10,5.7 v 0 c 0.7,1.2 1.5,2.4 2.4,3.5 0.4,0.5 0.8,0.9 1.2,1.3 -1.7,4.8 0.2,8.9 0.2,8.9 5.2,0.2 8.6,-2.3 9.3,-2.8 0.5,0.2 1,0.3 1.6,0.5 1.6,0.4 3.2,0.6 4.8,0.7 0.4,0 0.8,0 1.2,0 h 0.2 0.1 0.3 0.3 v 0 c 2.4,3.5 6.7,4 6.7,4 3.4,-3.6 3.2,-7.2 3.2,-7.2 l -0.1,-0.1 c 0.7,-0.5 1.3,-1 1.9,-1.5 1.2,-1.1 2.3,-2.4 3.2,-3.7 0.1,-0.1 0.2,-0.3 0.2,-0.4 3.4,0.2 5.9,-2.1 5.9,-2.1 -0.6,-4 -3.1,-5.7 -3.1,-5.7 h -0.1 c 0,-0.2 0,-0.5 0.1,-0.7 0,-0.4 0,-0.8 0,-1.2 v -0.3 -0.1 -0.1 c 0,-0.1 0,-0.1 0,-0.1 v -0.2 -0.3 c 0,-0.1 0,-0.2 0,-0.3 0,-0.1 0,-0.2 0,-0.3 v -0.3 -0.3 c -0.1,-0.4 -0.1,-0.8 -0.2,-1.2 -0.4,-1.5 -1,-3 -1.8,-4.3 -0.8,-1.3 -1.8,-2.5 -2.9,-3.5 -1.1,-1 -2.4,-1.8 -3.7,-2.4 -1.3,-0.6 -2.7,-1 -4.1,-1.1 -0.7,-0.1 -1.4,-0.1 -2,-0.1 h -0.3 -0.1 -0.1 -0.1 -0.3 c -0.1,0 -0.2,0 -0.3,0 -0.3,0 -0.7,0.1 -1,0.1 -1.4,0.3 -2.7,0.7 -3.8,1.4 -1.1,0.7 -2.1,1.5 -2.9,2.5 -0.8,1 -1.4,2 -1.9,3.1 -0.4,1.1 -0.7,2.2 -0.7,3.3 0,0.3 0,0.6 0,0.8 0,0.1 0,0.1 0,0.2 v 0.2 c 0,0.1 0,0.3 0,0.4 0.1,0.6 0.2,1.1 0.3,1.6 0.3,1 0.8,2 1.4,2.8 0.6,0.8 1.3,1.5 2.1,2 0.8,0.5 1.6,0.9 2.4,1.1 0.8,0.2 1.6,0.3 2.3,0.3 0.1,0 0.2,0 0.3,0 h 0.1 0.1 c 0.1,0 0.2,0 0.2,0 0,0 0,0 0.1,0 h 0.1 0.1 c 0.1,0 0.2,0 0.3,0 0.1,0 0.2,0 0.3,-0.1 0.2,0 0.3,-0.1 0.5,-0.1 0.3,-0.1 0.6,-0.2 0.9,-0.4 0.3,-0.1 0.5,-0.3 0.8,-0.5 0.1,-0.1 0.1,-0.1 0.2,-0.2 0.3,-0.2 0.3,-0.6 0.1,-0.8 -0.2,-0.2 -0.5,-0.3 -0.7,-0.1 -0.2,-0.2 -0.2,-0.1 -0.3,-0.1 -0.2,0.1 -0.4,0.2 -0.7,0.3 -0.2,0.1 -0.5,0.1 -0.8,0.2 -0.1,0 -0.3,0 -0.4,0 -0.1,0 -0.1,0 -0.2,0 -0.1,0 -0.1,0 -0.2,0 -0.1,0 -0.1,0 -0.2,0 -0.1,0 -0.2,0 -0.2,0 v 0 0 H 34.1 34 c -0.1,0 -0.1,0 -0.2,0 -0.6,-0.1 -1.2,-0.3 -1.7,-0.5 -0.6,-0.3 -1.1,-0.6 -1.6,-1.1 -0.5,-0.4 -0.9,-1 -1.3,-1.6 -0.3,-0.6 -0.6,-1.3 -0.7,-2 -0.1,-0.3 -0.1,-0.7 -0.1,-1.1 0,-0.1 0,-0.2 0,-0.3 v 0 0 -0.1 -0.1 c 0,-0.2 0,-0.4 0.1,-0.6 0.3,-1.5 1,-3 2.2,-4.2 0.3,-0.3 0.6,-0.5 1,-0.8 0.3,-0.2 0.7,-0.4 1.1,-0.6 0.4,-0.2 0.8,-0.3 1.2,-0.4 0.4,-0.1 0.8,-0.2 1.2,-0.2 0.2,0 0.4,0 0.6,0 0.1,0 0.1,0 0.1,0 h 0.2 0.1 v 0 0 h 0.2 c 0.5,0 0.9,0.1 1.4,0.2 0.9,0.2 1.8,0.5 2.6,1 1.6,0.9 3,2.3 3.9,4 0.4,0.8 0.7,1.8 0.9,2.7 0,0.2 0.1,0.5 0.1,0.7 v 0.2 0.2 c 0,0.1 0,0.1 0,0.2 0,0.1 0,0.1 0,0.2 v 0.2 0.2 c 0,0.1 0,0.3 0,0.4 0,0.3 0,0.5 -0.1,0.8 0,0.3 -0.1,0.5 -0.1,0.8 -0.1,0.1 -0.1,0.3 -0.2,0.6 -0.1,0.5 -0.3,1 -0.5,1.5 -0.4,1 -0.9,1.9 -1.5,2.7 -1.2,1.7 -2.9,3.1 -4.8,3.9 -1,0.4 -2,0.7 -3,0.9 -0.5,0.1 -1,0.1 -1.6,0.2 h -0.1 -0.1 -0.2 -0.3 -0.1 c 0.1,0 0,0 0,0 h -0.1 c -0.3,0 -0.6,0 -0.8,0 -1.1,-0.1 -2.2,-0.3 -3.3,-0.6 -1.1,-0.3 -2.1,-0.7 -3.1,-1.2 -2,-1 -3.7,-2.5 -5.1,-4.2 -0.7,-0.9 -1.3,-1.8 -1.8,-2.8 -0.5,-1 -0.9,-2 -1.2,-3 -0.3,-1 -0.5,-2.1 -0.5,-3.2 v -0.2 -0.1 0 -0.1 -0.2 0 -0.1 -0.1 -0.3 0 0 -0.1 c 0,-0.1 0,-0.3 0,-0.4 0,-0.5 0.1,-1.1 0.1,-1.6 0.1,-0.5 0.2,-1.1 0.3,-1.6 0.1,-0.5 0.2,-1.1 0.4,-1.6 0.3,-1.1 0.7,-2.1 1.1,-3.1 0.9,-2 2.1,-3.7 3.5,-5.1 0.4,-0.3 0.7,-0.7 1.1,-1 0.4,-0.3 0.8,-0.6 1.2,-0.9 0.4,-0.3 0.8,-0.5 1.3,-0.7 0.2,-0.1 0.4,-0.2 0.7,-0.3 0.1,0 0.2,-0.1 0.3,-0.1 0.1,-0.1 0.2,-0.1 0.3,-0.1 0.4,-0.2 0.9,-0.4 1.4,-0.5 0.1,0 0.2,-0.1 0.4,-0.1 0.1,0 0.2,-0.1 0.4,-0.1 0.2,-0.1 0.5,-0.1 0.7,-0.2 0.1,0 0.2,-0.1 0.4,-0.1 0.1,0 0.2,-0.1 0.4,-0.1 0.1,0 0.2,0 0.4,-0.1 h 0.2 0.2 c 0.1,0 0.2,0 0.4,-0.1 0.1,0 0.3,0 0.4,-0.1 0.1,0 0.3,0 0.4,0 0.1,0 0.2,0 0.3,0 h 0.2 0.1 0.1 c 0.1,0 0.3,0 0.4,0 h 0.2 c 0,0 0.1,0 0,0 v 0 h 0.1 c 0.1,0 0.2,0 0.4,0 0.5,0 0.9,0 1.4,0 0.9,0 1.8,0.1 2.7,0.3 1.8,0.3 3.4,0.9 4.9,1.6 1.5,0.7 2.9,1.6 4,2.6 0.1,0.1 0.1,0.1 0.2,0.2 0.1,0.1 0.1,0.1 0.2,0.2 0.1,0.1 0.3,0.3 0.4,0.4 0.1,0.1 0.3,0.3 0.4,0.4 0.1,0.1 0.3,0.3 0.4,0.4 0.5,0.5 1,1.1 1.4,1.6 0.8,1.1 1.5,2.1 2,3.2 0,0.1 0.1,0.1 0.1,0.2 0,0.1 0.1,0.1 0.1,0.2 0.1,0.1 0.1,0.3 0.2,0.4 0.1,0.1 0.1,0.2 0.2,0.4 0.1,0.1 0.1,0.2 0.2,0.4 0.2,0.5 0.4,0.9 0.5,1.4 0.2,0.7 0.4,1.3 0.6,1.9 0.1,0.2 0.3,0.4 0.5,0.3 0.2,0 0.4,-0.2 0.4,-0.4 -0.2,-1.1 -0.2,-1.8 -0.3,-2.6 z"
   id="path3778"
   inkscape:connector-curvature="0"
   style="fill:url(#SVGID_1_)" />
</svg> + mediatype: image/svg+xml + install: + spec: + deployments: + - name: grafana-operator + spec: + replicas: 1 + selector: + matchLabels: + name: grafana-operator + strategy: { } + template: + metadata: + labels: + name: grafana-operator + spec: + containers: + - args: + command: + - grafana-operator + env: + - name: TEMPLATE_PATH + value: /usr/local/bin/templates + - name: WATCH_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: OPERATOR_NAME + value: grafana-operator + image: quay.io/integreatly/grafana-operator:v3.10.2 + imagePullPolicy: Always + name: grafana-operator + ports: + - containerPort: 60000 + name: metrics + resources: { } + serviceAccountName: grafana-operator + permissions: + - rules: + - apiGroups: + - '' + resources: + - pods + - services + - endpoints + - persistentvolumeclaims + - events + - configmaps + - secrets + - serviceaccounts + verbs: + - '*' + - apiGroups: + - apps + resources: + - deployments + - deployments/finalizers + - daemonsets + - replicasets + - statefulsets + verbs: + - '*' + - apiGroups: + - route.openshift.io + resources: + - routes + - routes/custom-host + verbs: + - '*' + - apiGroups: + - monitoring.coreos.com + resources: + - servicemonitors + verbs: + - get + - create + - apiGroups: + - extensions + resources: + - ingresses + verbs: + - '*' + - apiGroups: + - integreatly.org + resources: + - grafanas + - grafanadashboards + - grafanadatasources + - grafanas/finalizers + - grafanas/status + - grafanadashboards/status + - grafanadatasources/status + verbs: + - '*' + serviceAccountName: grafana-operator + strategy: deployment + installModes: + - supported: true + type: OwnNamespace + - supported: true + type: SingleNamespace + - supported: false + type: MultiNamespace + - supported: false + type: AllNamespaces + keywords: + - Grafana + - Metrics + - Monitoring + links: + - name: Documentation + url: https://github.com/integr8ly/grafana-operator/tree/v3.10.2/documentation + - name: Grafana + url: https://grafana.com + maintainers: + - email: integreatly-dev@redhat.com + name: Red Hat + maturity: alpha + provider: + name: Red Hat + replaces: grafana-operator.v3.10.1 + version: 3.10.2 + + diff --git a/deploy/olm-catalog/grafana-operator/3.x.x/3.10.2/grafanadashboards.integreatly.org.crd.yaml b/deploy/olm-catalog/grafana-operator/3.x.x/3.10.2/grafanadashboards.integreatly.org.crd.yaml new file mode 100644 index 000000000..b631e3c7b --- /dev/null +++ b/deploy/olm-catalog/grafana-operator/3.x.x/3.10.2/grafanadashboards.integreatly.org.crd.yaml @@ -0,0 +1,43 @@ +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 + subresources: + status: {} + version: v1alpha1 + validation: + openAPIV3Schema: + properties: + spec: + properties: + name: + type: string + json: + type: string + jsonnet: + description: Jsonnet source. Has access to grafonnet. + type: string + url: + type: string + description: URL to dashboard json + datasources: + type: array + items: + description: Input datasources to resolve before importing + type: object + plugins: + type: array + items: + description: Grafana Plugin Object + type: object + customFolderName: + description: Folder name that this dashboard will be assigned to. + type: string diff --git a/deploy/olm-catalog/grafana-operator/3.x.x/3.10.2/grafanadatasources.integreatly.org.crd.yaml b/deploy/olm-catalog/grafana-operator/3.x.x/3.10.2/grafanadatasources.integreatly.org.crd.yaml new file mode 100644 index 000000000..1f3aba2ae --- /dev/null +++ b/deploy/olm-catalog/grafana-operator/3.x.x/3.10.2/grafanadatasources.integreatly.org.crd.yaml @@ -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 + subresources: + status: {} + 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 \ No newline at end of file diff --git a/deploy/olm-catalog/grafana-operator/3.x.x/3.10.2/grafanas.integreatly.org.crd.yaml b/deploy/olm-catalog/grafana-operator/3.x.x/3.10.2/grafanas.integreatly.org.crd.yaml new file mode 100644 index 000000000..dca03c85c --- /dev/null +++ b/deploy/olm-catalog/grafana-operator/3.x.x/3.10.2/grafanas.integreatly.org.crd.yaml @@ -0,0 +1,237 @@ +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 + subresources: + status: { } + version: v1alpha1 + validation: + openAPIV3Schema: + required: [ "spec" ] + properties: + spec: + properties: + 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 + configMaps: + type: array + items: + type: string + description: Config map 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 + ingress: + type: object + properties: + enabled: + type: boolean + description: Create an ingress / route + ingressClassName: + type: string + description: Ingress class name + path: + type: string + description: Ingress path + pathType: + type: string + description: pathType specifies how ingress paths should be matched + hostname: + type: string + description: The hostname of the ingress / route + annotations: + type: object + description: Additional annotations for the ingress / route + labels: + type: object + description: Additional labels for the ingress / route + targetPort: + type: string + description: Override port to target in the grafana service + service: + type: object + properties: + name: + type: string + description: Override default service name + ports: + type: array + description: Override default ports + items: + type: object + description: A port to add to the grafana service + annotations: + type: object + description: Additional annotations for the service + labels: + type: object + description: Additional labels for the service + type: + type: string + description: Service type (NodePort, ClusterIP or LoadBalancer) + deployment: + type: object + properties: + annotations: + type: object + description: Additional annotations for the service + labels: + type: object + description: Additional labels for the service + nodeSelector: + type: object + description: Additional labels for the running grafana pods in a labeled node. + tolerations: + type: array + description: Additonal labels for running grafana pods in tained nodes. + affinity: + type: object + description: Additonal labels for running grafana pods with affinity properties. + envFrom: + type: array + description: Environment variables from Secret or ConfigMap. + skipCreateAdminAccount: + type: boolean + description: Disable creating a random admin user + priorityClassName: + type: string + description: Pod priority class name + + serviceAccount: + type: object + properties: + skip: + type: boolean + description: Disable ServiceAccount creation for grafana + annotations: + type: object + description: Additional annotations for the serviceaccount + labels: + type: object + description: Additional labels for the serviceaccount + client: + type: object + description: Grafana client settings + compat: + type: object + description: Backwards compatibility switches + dashboardLabelSelectors: + type: array + items: + type: object + description: Label selector or match expressions + jsonnet: + type: object + description: Jsonnet library configuration + livenessProbeSpec: + type: object + properties: + initialDelaySeconds: + description: >- + Number of seconds after the container has + started before liveness probes are initiated. More info: + https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes + format: int32 + type: integer + timeoutSeconds: + description: Number of seconds after which the probe times out. Defaults to 1 second. + Minimum value is 1. + format: int32 + type: integer + periodSeconds: + description: >- + How often (in seconds) to perform the probe. + Default to 10 seconds. Minimum value is 1. + format: int32 + type: integer + successThreshold: + description: >- + Minimum consecutive successes for the probe + to be considered successful after having failed. Defaults + to 1. Must be 1 for liveness and startup. Minimum value + is 1. + format: int32 + type: integer + failureThreshold: + description: >- + When a probe fails, Kubernetes will try failureThreshold times before giving up. + Giving up in case of liveness probe means restarting the container. + In case of readiness probe the Pod will be marked Unready. + Defaults to 3. Minimum value is 1. + format: int32 + type: integer + readinessProbeSpec: + type: object + properties: + initialDelaySeconds: + description: >- + Number of seconds after the container has + started before liveness probes are initiated. More info + https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes + format: int32 + type: integer + timeoutSeconds: + description: >- + Number of seconds after which the probe times out. Defaults to 1 second. + Minimum value is 1. + format: int32 + type: integer + periodSeconds: + description: >- + How often (in seconds) to perform the probe. + Default to 10 seconds. Minimum value is 1. + format: int32 + type: integer + successThreshold: + description: >- + Minimum consecutive successes for the probe + to be considered successful after having failed. Defaults + to 1. Must be 1 for liveness and startup. Minimum value + is 1. + format: int32 + type: integer + failureThreshold: + description: >- + When a probe fails, Kubernetes will try failureThreshold times before giving up. + Giving up in case of liveness probe means restarting the container. + In case of readiness probe the Pod will be marked Unready. + Defaults to 3. Minimum value is 1. + format: int32 + type: integer diff --git a/deploy/operator.yaml b/deploy/operator.yaml index ff295a4cc..34b606769 100644 --- a/deploy/operator.yaml +++ b/deploy/operator.yaml @@ -17,7 +17,7 @@ spec: serviceAccountName: grafana-operator containers: - name: grafana-operator - image: quay.io/integreatly/grafana-operator:v3.10.1 + image: quay.io/integreatly/grafana-operator:v3.10.2 ports: - containerPort: 60000 name: metrics diff --git a/version/version.go b/version/version.go index 0843b7fa6..584c49f30 100644 --- a/version/version.go +++ b/version/version.go @@ -1,5 +1,5 @@ package version var ( - Version = "3.10.1" + Version = "3.10.2" )