Merge pull request #137 from HubertStefanski/INTLY-8046

Bump operator-sdk version to 0.15.2 and AMO to 1.2.0 for release

Makefile

@@ -14,8 +14,8 @@ COMPILE_TARGET=./tmp/_output/bin/$(PROJECT)
 PROMETHEUS_OPERATOR_VERSION=v0.34.0
 LOCAL=local
 GRAFANA_OPERATOR_VERSION=v3.2.0
-AMO_VERSION?=v1.1.6
-PREV_AMO_VERSION=v1.1.5
+AMO_VERSION=1.2.0
+PREV_AMO_VERSION=1.1.6
 
 AUTH_TOKEN=$(shell curl -sH "Content-Type: application/json" -XPOST https://quay.io/cnr/api/v1/users/login -d '{"user": {"username": "$(QUAY_USERNAME)", "password": "${QUAY_PASSWORD}"}}' | jq -r '.token')
 
@@ -47,7 +47,7 @@ code/gen:
 .PHONY: gen/csv
 gen/csv:
 	sed -i.bak 's/image:.*/image: quay\.io\/integreatly\/application-monitoring-operator:v$(AMO_VERSION)/g' deploy/operator.yaml && rm deploy/operator.yaml.bak
-	@operator-sdk olm-catalog gen-csv --operator-name=application-monitoring-operator --csv-version $(AMO_VERSION) --from-version $(PREV_AMO_VERSION) --update-crds --csv-channel=integreatly --default-channel
+	@operator-sdk generate csv --operator-name=application-monitoring-operator --csv-version $(AMO_VERSION) --from-version $(PREV_AMO_VERSION) --update-crds --csv-channel=integreatly --default-channel
 	@sed -i.bak 's/$(PREV_AMO_VERSION)/$(AMO_VERSION)/g' deploy/olm-catalog/application-monitoring-operator/application-monitoring-operator.package.yaml && rm deploy/olm-catalog/application-monitoring-operator/application-monitoring-operator.package.yaml.bak
 	@sed -i.bak s/application-monitoring-operator:v$(PREV_AMO_VERSION)/application-monitoring-operator:v$(AMO_VERSION)/g deploy/olm-catalog/application-monitoring-operator/$(AMO_VERSION)/application-monitoring-operator.v$(AMO_VERSION).clusterserviceversion.yaml && rm deploy/olm-catalog/application-monitoring-operator/$(AMO_VERSION)/application-monitoring-operator.v$(AMO_VERSION).clusterserviceversion.yaml.bak
 

deploy/crds/applicationmonitoring.integreatly.org_applicationmonitorings_crd.yaml

@@ -10,33 +10,62 @@ spec:
     plural: applicationmonitorings
     singular: applicationmonitoring
   scope: Namespaced
-  version: v1alpha1
+  subresources:
+    status: {}
   validation:
     openAPIV3Schema:
-      required: ["spec"]
+      description: ApplicationMonitoring is the Schema for the applicationmonitorings
+        API
       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/sig-architecture/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/sig-architecture/api-conventions.md#types-kinds'
+          type: string
+        metadata:
+          type: object
         spec:
-          required: ["labelSelector"]
+          description: ApplicationMonitoringSpec defines the desired state of ApplicationMonitoring
           properties:
-            labelSelector:
+            additionalScrapeConfigSecretKey:
               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:
+            alertmanagerInstanceNamespaces:
+              type: string
+            labelSelector:
+              minLength: 1
+              type: string
+            prometheusInstanceNamespaces:
               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
-            prometheusInstanceNamespaces:
-              type: string
-              description: The list of namespaces to watch for prometheus custom resources
-            alertmanagerInstanceNamespaces:
+            selfSignedCerts:
+              type: boolean
+          required:
+          - labelSelector
+          type: object
+        status:
+          description: ApplicationMonitoringStatus defines the observed state of ApplicationMonitoring
+          properties:
+            lastblackboxconfig:
               type: string
-              description: The list of namespaces to watch for alertmanager custom resources
+            phase:
+              type: integer
+          required:
+          - lastblackboxconfig
+          - phase
+          type: object
+      type: object
+  version: v1alpha1
+  versions:
+  - name: v1alpha1
+    served: true
+    storage: true

deploy/crds/applicationmonitoring.integreatly.org_blackboxtargets_crd.yaml

@@ -12,24 +12,31 @@ spec:
   scope: Namespaced
   validation:
     openAPIV3Schema:
+      description: BlackboxTarget is the Schema for the blackboxtargets API
       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'
+            internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/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'
+            submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
           type: string
         metadata:
           type: object
         spec:
+          description: BlackboxTargetSpec defines the desired state of BlackboxTarget
           properties:
             blackboxTargets:
-              description: 'Defines an endpoint which can be probed using the Prometheus Blackbox exporter'
+              description: 'INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
+                Important: Run "operator-sdk generate k8s" to regenerate code after
+                modifying this file Add custom validation using kubebuilder tags:
+                https://book.kubebuilder.io/beyond_basics/generating_crd.html'
               items:
+                description: 'BlackboxtargetStructure contains: A target (url, module
+                  and service name) to be probed by the'
                 properties:
                   module:
                     type: string
@@ -38,21 +45,25 @@ spec:
                   url:
                     type: string
                 required:
-                - url
-                - service
                 - module
+                - service
+                - url
                 type: object
               type: array
           type: object
         status:
+          description: BlackboxTargetStatus defines the observed state of BlackboxTarget
           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
+              description: 'INSERT ADDITIONAL STATUS FIELD - define observed state
+                of cluster Important: Run "operator-sdk generate k8s" to regenerate
+                code after modifying this file Add custom validation using kubebuilder
+                tags: https://book.kubebuilder.io/beyond_basics/generating_crd.html'
               type: integer
           required:
           - phase
           type: object
+      type: object
   version: v1alpha1
   versions:
   - name: v1alpha1

deploy/olm-catalog/application-monitoring-operator/1.2.0/applicationmonitoring.integreatly.org_applicationmonitorings_crd.yaml

@@ -0,0 +1,71 @@
+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
+  subresources:
+    status: {}
+  validation:
+    openAPIV3Schema:
+      description: ApplicationMonitoring is the Schema for the applicationmonitorings
+        API
+      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/sig-architecture/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/sig-architecture/api-conventions.md#types-kinds'
+          type: string
+        metadata:
+          type: object
+        spec:
+          description: ApplicationMonitoringSpec defines the desired state of ApplicationMonitoring
+          properties:
+            additionalScrapeConfigSecretKey:
+              type: string
+            additionalScrapeConfigSecretName:
+              type: string
+            alertmanagerInstanceNamespaces:
+              type: string
+            labelSelector:
+              minLength: 1
+              type: string
+            prometheusInstanceNamespaces:
+              type: string
+            prometheusRetention:
+              type: string
+            prometheusStorageRequest:
+              type: string
+            selfSignedCerts:
+              type: boolean
+          required:
+          - labelSelector
+          type: object
+        status:
+          description: ApplicationMonitoringStatus defines the observed state of ApplicationMonitoring
+          properties:
+            lastblackboxconfig:
+              type: string
+            phase:
+              type: integer
+          required:
+          - lastblackboxconfig
+          - phase
+          type: object
+      type: object
+  version: v1alpha1
+  versions:
+  - name: v1alpha1
+    served: true
+    storage: true

deploy/olm-catalog/application-monitoring-operator/1.2.0/applicationmonitoring.integreatly.org_blackboxtargets_crd.yaml

@@ -0,0 +1,71 @@
+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:
+      description: BlackboxTarget is the Schema for the blackboxtargets API
+      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/sig-architecture/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/sig-architecture/api-conventions.md#types-kinds'
+          type: string
+        metadata:
+          type: object
+        spec:
+          description: BlackboxTargetSpec defines the desired state of BlackboxTarget
+          properties:
+            blackboxTargets:
+              description: 'INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
+                Important: Run "operator-sdk generate k8s" to regenerate code after
+                modifying this file Add custom validation using kubebuilder tags:
+                https://book.kubebuilder.io/beyond_basics/generating_crd.html'
+              items:
+                description: 'BlackboxtargetStructure contains: A target (url, module
+                  and service name) to be probed by the'
+                properties:
+                  module:
+                    type: string
+                  service:
+                    type: string
+                  url:
+                    type: string
+                required:
+                - module
+                - service
+                - url
+                type: object
+              type: array
+          type: object
+        status:
+          description: BlackboxTargetStatus defines the observed state of BlackboxTarget
+          properties:
+            phase:
+              description: 'INSERT ADDITIONAL STATUS FIELD - define observed state
+                of cluster Important: Run "operator-sdk generate k8s" to regenerate
+                code after modifying this file Add custom validation using kubebuilder
+                tags: https://book.kubebuilder.io/beyond_basics/generating_crd.html'
+              type: integer
+          required:
+          - phase
+          type: object
+      type: object
+  version: v1alpha1
+  versions:
+  - name: v1alpha1
+    served: true
+    storage: true