Merge pull request #86 from davidkirwan/new_olm_version

Bumping version of the AMO to 0.0.28

Makefile

@@ -3,7 +3,7 @@ NAMESPACE ?= application-monitoring
 PROJECT ?= application-monitoring-operator
 REG=quay.io
 SHELL=/bin/bash
-TAG ?= 0.0.26
+TAG ?= 0.0.27
 PKG=github.com/integr8ly/application-monitoring-operator
 TEST_DIRS?=$(shell sh -c "find $(TOP_SRC_DIRS) -name \\*_test.go -exec dirname {} \\; | sort | uniq")
 TEST_POD_NAME=application-monitoring-operator-test

deploy/olm-catalog/application-monitoring-operator/monitoring-0.0.27/applicationmonitoring.crd.yaml

@@ -0,0 +1,36 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: applicationmonitorings.applicationmonitoring.integreatly.org
+spec:
+  group: applicationmonitoring.integreatly.org
+  names:
+    kind: ApplicationMonitoring
+    listKind: ApplicationMonitoringList
+    plural: applicationmonitorings
+    singular: applicationmonitoring
+  scope: Namespaced
+  version: v1alpha1
+  validation:
+    openAPIV3Schema:
+      required: ["spec"]
+      properties:
+        spec:
+          required: ["labelSelector"]
+          properties:
+            labelSelector:
+              type: string
+              minimum: 1
+              description: The selector used by the Prometheus and Grafana Operators to discover resources
+            additionalScrapeConfigSecretName:
+              type: string
+              description: The name of the secret from which additional scrape configs will be passed to the prometheus operator
+            additionalScrapeConfigSecretKey:
+              type: string
+              description: The key under which additional scrape configs are stored within the secret
+            prometheusRetention:
+              type: string
+              description: Retention time for prometheus data. See https://prometheus.io/docs/prometheus/latest/storage/
+            prometheusStorageRequest:
+              type: string
+              description: How much storage to assign to a volume claim for persisting Prometheus data. See https://github.com/coreos/prometheus-operator/blob/ca400fdc3edd0af0df896a338eca270e115b74d7/Documentation/api.md#storagespec

deploy/olm-catalog/application-monitoring-operator/monitoring-0.0.27/blackboxtarget.crd.yaml

@@ -0,0 +1,60 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: blackboxtargets.applicationmonitoring.integreatly.org
+spec:
+  group: applicationmonitoring.integreatly.org
+  names:
+    kind: BlackboxTarget
+    listKind: BlackboxTargetList
+    plural: blackboxtargets
+    singular: blackboxtarget
+  scope: Namespaced
+  validation:
+    openAPIV3Schema:
+      properties:
+        apiVersion:
+          description: 'APIVersion defines the versioned schema of this representation
+            of an object. Servers should convert recognized schemas to the latest
+            internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources'
+          type: string
+        kind:
+          description: 'Kind is a string value representing the REST resource this
+            object represents. Servers may infer this from the endpoint the client
+            submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds'
+          type: string
+        metadata:
+          type: object
+        spec:
+          properties:
+            blackboxTargets:
+              description: 'Defines an endpoint which can be probed using the Prometheus Blackbox exporter'
+              items:
+                properties:
+                  module:
+                    type: string
+                  service:
+                    type: string
+                  url:
+                    type: string
+                required:
+                - url
+                - service
+                - module
+                type: object
+              type: array
+          type: object
+        status:
+          properties:
+            phase:
+              description: 'The field phase is a status field indicating which phase the controller is with regards to reconciling blackbox target resources.'
+              format: int64
+              type: integer
+          required:
+          - phase
+          type: object
+  version: v1alpha1
+  versions:
+  - name: v1alpha1
+    served: true
+    storage: true

deploy/olm-catalog/application-monitoring-operator/monitoring-0.0.27/grafana_crd.yaml

@@ -0,0 +1,48 @@
+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
+            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
+            dashboardLabelSelector:
+              type: array
+              items:
+                type: object
+                description: Label selector or match expressions

deploy/olm-catalog/application-monitoring-operator/monitoring-0.0.27/grafana_dashboard_crd.yaml

@@ -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

deploy/olm-catalog/application-monitoring-operator/monitoring-0.0.27/grafana_datasource_crd.yaml

@@ -0,0 +1,39 @@
+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
+  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
+  version: v1alpha1
+  versions:
+    - name: v1alpha1
+      served: true
+      storage: true

deploy/olm-catalog/application-monitoring-operator/monitoring.package.yaml

@@ -1,4 +1,4 @@
 packageName: integreatly-monitoring
 channels:
-- currentCSV: application-monitoring-operator.v0.0.26
+- currentCSV: application-monitoring-operator.v0.0.27
   name: integreatly

version/version.go

@@ -1,5 +1,5 @@
 package version
 
 var (
-	Version = "0.0.26"
+	Version = "0.0.27"
 )