From c3fd8cc74eb0735bb0a718c4032ae829a199547c Mon Sep 17 00:00:00 2001 From: Peter Braun Date: Fri, 16 Aug 2019 09:59:48 +0200 Subject: [PATCH 1/2] prepeare release v1.3.1 --- Gopkg.lock | 46 +-- .../1.3.0/grafana-operator.package.yaml | 2 +- ...operator.v1.3.1.clusterserviceversion.yaml | 261 ++++++++++++++++++ version/version.go | 2 +- 4 files changed, 286 insertions(+), 25 deletions(-) create mode 100644 deploy/olm-catalog/grafana-operator/1.3.0/grafana-operator.v1.3.1.clusterserviceversion.yaml diff --git a/Gopkg.lock b/Gopkg.lock index b3af34218..ee1f09116 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -46,7 +46,7 @@ name = "github.com/emicklei/go-restful" packages = [ ".", - "log" + "log", ] pruneopts = "NT" revision = "e37671aced663c8d3a395bd301857e26dcf4340c" @@ -121,7 +121,7 @@ name = "github.com/gogo/protobuf" packages = [ "proto", - "sortkeys" + "sortkeys", ] pruneopts = "NT" revision = "4cbf7e384e768b4e01799441fdf2a706a5635ae7" @@ -151,7 +151,7 @@ "ptypes", "ptypes/any", "ptypes/duration", - "ptypes/timestamp" + "ptypes/timestamp", ] pruneopts = "NT" revision = "aa810b61a9c79d51363740d207bb46cf8e620ed5" @@ -187,7 +187,7 @@ packages = [ "OpenAPIv2", "compiler", - "extensions" + "extensions", ] pruneopts = "NT" revision = "7c663266750e7d82587642f65e60bc4083f1f84e" @@ -199,7 +199,7 @@ name = "github.com/gregjones/httpcache" packages = [ ".", - "diskcache" + "diskcache", ] pruneopts = "NT" revision = "c63ab54fda8f77302f8d414e19933f2b6026a089" @@ -209,7 +209,7 @@ name = "github.com/hashicorp/golang-lru" packages = [ ".", - "simplelru" + "simplelru", ] pruneopts = "NT" revision = "20f1fb78b0740ba8c3cb143a61e86ba5c8669768" @@ -238,7 +238,7 @@ packages = [ "buffer", "jlexer", - "jwriter" + "jwriter", ] pruneopts = "NT" revision = "60711f1a8329503b04e1c88535f419d0bb440bff" @@ -274,7 +274,7 @@ "pkg/k8sutil", "pkg/leader", "pkg/ready", - "version" + "version", ] pruneopts = "NT" revision = "560208dc998de497bbf59fea1b63426aec430934" @@ -337,7 +337,7 @@ "internal/bufferpool", "internal/color", "internal/exit", - "zapcore" + "zapcore", ] pruneopts = "NT" revision = "ff33455a0e382e8a81d14dd7c922020b6b5e7982" @@ -361,7 +361,7 @@ "http/httpguts", "http2", "http2/hpack", - "idna" + "idna", ] pruneopts = "NT" revision = "ed066c81e75eba56dd9bd2139ade88125b855585" @@ -375,7 +375,7 @@ "google", "internal", "jws", - "jwt" + "jwt", ] pruneopts = "NT" revision = "5dab4167f31cbd76b407f1486c86b40748bc5073" @@ -386,7 +386,7 @@ name = "golang.org/x/sys" packages = [ "unix", - "windows" + "windows", ] pruneopts = "NT" revision = "b90733256f2e882e81d52f9126de08df5615afd9" @@ -409,7 +409,7 @@ "unicode/cldr", "unicode/norm", "unicode/rangetable", - "width" + "width", ] pruneopts = "NT" revision = "f21a4dfb5e38f5895301dc265a8def02365cc3d0" @@ -439,7 +439,7 @@ "internal/fastwalk", "internal/gopathwalk", "internal/module", - "internal/semver" + "internal/semver", ] pruneopts = "NT" revision = "78ee07aa9465da43bde6d5044c687571ab4362d6" @@ -457,7 +457,7 @@ "internal/modules", "internal/remote_api", "internal/urlfetch", - "urlfetch" + "urlfetch", ] pruneopts = "NT" revision = "e9657d882bb81064595ca3b56cbe2546bbabf7b1" @@ -512,7 +512,7 @@ "settings/v1alpha1", "storage/v1", "storage/v1alpha1", - "storage/v1beta1" + "storage/v1beta1", ] pruneopts = "NT" revision = "2d6f90ab1293a1fb871cf149423ebb72aa7423aa" @@ -562,7 +562,7 @@ "pkg/version", "pkg/watch", "third_party/forked/golang/json", - "third_party/forked/golang/reflect" + "third_party/forked/golang/reflect", ] pruneopts = "NT" revision = "103fd098999dc9c0c88536f5c9ad2e5da39373ae" @@ -635,7 +635,7 @@ "util/integer", "util/jsonpath", "util/retry", - "util/workqueue" + "util/workqueue", ] pruneopts = "NT" revision = "1f13a808da65775f22cbf47862c4e5898d8f4ca1" @@ -667,7 +667,7 @@ "cmd/lister-gen/generators", "cmd/openapi-gen", "cmd/openapi-gen/args", - "pkg/util" + "pkg/util", ] pruneopts = "T" revision = "6702109cc68eb6fe6350b83e14407c8d7309fd1a" @@ -684,7 +684,7 @@ "generator", "namer", "parser", - "types" + "types", ] pruneopts = "NT" revision = "f8a0810f38afb8478882b3835a615aebfda39afa" @@ -707,7 +707,7 @@ "pkg/generators", "pkg/generators/rules", "pkg/util/proto", - "pkg/util/sets" + "pkg/util/sets", ] pruneopts = "NT" revision = "ced9eb3070a5f1c548ef46e8dfe2a97c208d9f03" @@ -741,7 +741,7 @@ "pkg/source/internal", "pkg/webhook/admission", "pkg/webhook/admission/types", - "pkg/webhook/types" + "pkg/webhook/types", ] pruneopts = "NT" revision = "53fc44b56078cd095b11bd44cfa0288ee4cf718f" @@ -791,7 +791,7 @@ "sigs.k8s.io/controller-runtime/pkg/runtime/log", "sigs.k8s.io/controller-runtime/pkg/runtime/scheme", "sigs.k8s.io/controller-runtime/pkg/runtime/signals", - "sigs.k8s.io/controller-runtime/pkg/source" + "sigs.k8s.io/controller-runtime/pkg/source", ] solver-name = "gps-cdcl" solver-version = 1 diff --git a/deploy/olm-catalog/grafana-operator/1.3.0/grafana-operator.package.yaml b/deploy/olm-catalog/grafana-operator/1.3.0/grafana-operator.package.yaml index 3eb30db80..4694738c2 100644 --- a/deploy/olm-catalog/grafana-operator/1.3.0/grafana-operator.package.yaml +++ b/deploy/olm-catalog/grafana-operator/1.3.0/grafana-operator.package.yaml @@ -1,4 +1,4 @@ packageName: grafana-operator channels: - name: alpha - currentCSV: grafana-operator.v1.3.0 \ No newline at end of file + currentCSV: grafana-operator.v1.3.1 \ No newline at end of file diff --git a/deploy/olm-catalog/grafana-operator/1.3.0/grafana-operator.v1.3.1.clusterserviceversion.yaml b/deploy/olm-catalog/grafana-operator/1.3.0/grafana-operator.v1.3.1.clusterserviceversion.yaml new file mode 100644 index 000000000..31302c4fb --- /dev/null +++ b/deploy/olm-catalog/grafana-operator/1.3.0/grafana-operator.v1.3.1.clusterserviceversion.yaml @@ -0,0 +1,261 @@ +apiVersion: operators.coreos.com/v1alpha1 +kind: ClusterServiceVersion +metadata: + annotations: + capabilities: Basic Install + description: An Operator for managing Grafana instances, dashboards and data sources + categories: "Monitoring" + containerImage: quay.io/integreatly/grafana-operator:v1.3.1 + createdAt: 2019-07-23T00:00:00Z + support: Red Hat + certified: "False" + repository: https://github.com/integr8ly/grafana-operator + alm-examples: |- + [ + { + "apiVersion": "integreatly.org/v1alpha1", + "kind": "Grafana", + "metadata": { + "name": "example-grafana" + }, + "spec": { + "config": { + "auth": { + "disable_signout_menu": true + }, + "auth.anonymous": { + "enabled": true + }, + "log": { + "level": "warn", + "mode": "console" + }, + "security": { + "admin_password": "secret", + "admin_user": "root" + } + }, + "dashboardLabelSelector": [ + { + "matchExpressions": [ + { + "key": "app", + "operator": "In", + "values": [ + "grafana" + ] + } + ] + } + ] + } + }, + { + "apiVersion": "integreatly.org/v1alpha1", + "kind": "GrafanaDashboard", + "metadata": { + "labels": { + "app": "grafana" + }, + "name": "simple-dashboard" + }, + "spec": { + "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", + "name": "simple-dashboard.json" + } + }, + { + "apiVersion": "integreatly.org/v1alpha1", + "kind": "GrafanaDataSource", + "metadata": { + "name": "example-grafanadatasource" + }, + "spec": { + "datasources": [ + { + "access": "proxy", + "editable": true, + "isDefault": true, + "jsonData": { + "timeInterval": "5s" + }, + "name": "Prometheus", + "type": "prometheus", + "url": "http://prometheus-service:9090", + "version": 1 + } + ], + "name": "example-datasources.yaml" + } + } + ] + name: grafana-operator.v1.3.0 + namespace: placeholder +spec: + apiservicedefinitions: {} + customresourcedefinitions: + owned: + - kind: Grafana + name: grafanas.integreatly.org + version: v1alpha1 + description: Represents a Grafana Instance + displayName: Grafana + - kind: GrafanaDashboard + name: grafanadashboards.integreatly.org + version: v1alpha1 + description: Represents a Grafana Dashboard + displayName: Grafana Dashboard + - kind: GrafanaDataSource + name: grafanadatasources.integreatly.org + version: v1alpha1 + description: Represents a Grafana Data Source + displayName: Grafana Data Source + 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 + links: + - name: Documentation + url: https://github.com/integr8ly/grafana-operator/tree/v1.3.0/documentation + - name: Grafana + url: https://grafana.com + 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: + - --grafana-image=quay.io/openshift/origin-grafana + - --grafana-image-tag=4.2 + 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:latest + imagePullPolicy: Always + name: grafana-operator + ports: + - containerPort: 60000 + name: metrics + readinessProbe: + exec: + command: + - stat + - /tmp/operator-sdk-ready + failureThreshold: 1 + initialDelaySeconds: 4 + periodSeconds: 10 + resources: {} + serviceAccountName: grafana-operator + permissions: + - rules: + - apiGroups: + - "" + resources: + - pods + - services + - endpoints + - persistentvolumeclaims + - events + - configmaps + - secrets + - serviceaccounts + verbs: + - '*' + - apiGroups: + - apps + resources: + - deployments + - daemonsets + - replicasets + - statefulsets + verbs: + - '*' + - apiGroups: + - route.openshift.io + resources: + - routes + verbs: + - '*' + - apiGroups: + - monitoring.coreos.com + resources: + - servicemonitors + verbs: + - get + - create + - apiGroups: + - extensions + resources: + - ingresses + verbs: + - '*' + - apiGroups: + - integreatly.org + resources: + - grafanas + - grafanadashboards + - grafanadatasources + - grafanas/finalizers + - grafanadashboards/finalizers + - grafanadatasources/finalizers + 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 + maintainers: + - email: integreatly-dev@redhat.com + name: Red Hat + maturity: alpha + provider: + name: Red Hat + version: 1.3.0 diff --git a/version/version.go b/version/version.go index 5ab462930..27aa6a10a 100644 --- a/version/version.go +++ b/version/version.go @@ -1,5 +1,5 @@ package version var ( - Version = "1.3.0" + Version = "1.3.1" ) From 997f4f14f6aff0a9324ba5a8505ff76df14732ce Mon Sep 17 00:00:00 2001 From: Peter Braun Date: Fri, 16 Aug 2019 10:56:38 +0200 Subject: [PATCH 2/2] update versions in csv --- .../grafana-operator.v1.3.1.clusterserviceversion.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/deploy/olm-catalog/grafana-operator/1.3.0/grafana-operator.v1.3.1.clusterserviceversion.yaml b/deploy/olm-catalog/grafana-operator/1.3.0/grafana-operator.v1.3.1.clusterserviceversion.yaml index 31302c4fb..420402aa9 100644 --- a/deploy/olm-catalog/grafana-operator/1.3.0/grafana-operator.v1.3.1.clusterserviceversion.yaml +++ b/deploy/olm-catalog/grafana-operator/1.3.0/grafana-operator.v1.3.1.clusterserviceversion.yaml @@ -89,7 +89,7 @@ metadata: } } ] - name: grafana-operator.v1.3.0 + name: grafana-operator.v1.3.1 namespace: placeholder spec: apiservicedefinitions: {} @@ -127,7 +127,7 @@ spec: displayName: Grafana Operator links: - name: Documentation - url: https://github.com/integr8ly/grafana-operator/tree/v1.3.0/documentation + url: https://github.com/integr8ly/grafana-operator/tree/v1.3.1/documentation - name: Grafana url: https://grafana.com icon: @@ -258,4 +258,4 @@ spec: maturity: alpha provider: name: Red Hat - version: 1.3.0 + version: 1.3.1