Merge pull request #3519 from integr8ly/prepare-for-release-rhoam-v1.…

…42.0

merge for release 1.42.0

Makefile

@@ -46,7 +46,7 @@ SANDBOX_NAMESPACE ?= sandbox-rhoam-operator
 
 # These tags are modified by the prepare-release script.
 RHMI_TAG ?= 2.9.0
-RHOAM_TAG ?= 1.41.0
+RHOAM_TAG ?= 1.42.0
 
 export SKIP_FLAKES := true
 

bundles/managed-api-service/1.42.0/bundle.Dockerfile

@@ -0,0 +1,21 @@
+FROM scratch
+
+# Core bundle labels.
+LABEL operators.operatorframework.io.bundle.mediatype.v1=registry+v1
+LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/
+LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
+LABEL operators.operatorframework.io.bundle.package.v1=managed-api-service
+LABEL operators.operatorframework.io.bundle.channels.v1=stable
+LABEL operators.operatorframework.io.bundle.channel.default.v1=stable
+LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.21.0
+LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
+LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v2
+
+# Labels for testing.
+LABEL operators.operatorframework.io.test.mediatype.v1=scorecard+v1
+LABEL operators.operatorframework.io.test.config.v1=tests/scorecard/
+
+# Copy files to locations specified by labels.
+COPY bundles/managed-api-service/1.42.0/manifests /manifests/
+COPY bundles/managed-api-service/1.42.0/metadata /metadata/
+COPY bundles/managed-api-service/1.42.0/tests/scorecard /tests/scorecard/

bundles/managed-api-service/1.42.0/manifests/integreatly.org_rhmis.yaml

@@ -0,0 +1,194 @@
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.8.0
+  creationTimestamp: null
+  name: rhmis.integreatly.org
+spec:
+  group: integreatly.org
+  names:
+    kind: RHMI
+    listKind: RHMIList
+    plural: rhmis
+    singular: rhmi
+  scope: Namespaced
+  versions:
+    - name: v1alpha1
+      schema:
+        openAPIV3Schema:
+          description: RHMI is the Schema for the rhmis 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: RHMISpec defines the desired state of RHMI
+              properties:
+                APIServer:
+                  type: string
+                alertFromAddress:
+                  type: string
+                alertingEmailAddress:
+                  type: string
+                alertingEmailAddresses:
+                  properties:
+                    businessUnit:
+                      type: string
+                    cssre:
+                      type: string
+                  required:
+                    - businessUnit
+                    - cssre
+                  type: object
+                deadMansSnitchSecret:
+                  description: "DeadMansSnitchSecret is the name of a secret in the installation namespace containing connection details for Dead Mans Snitch. The secret must contain the following fields: \n url"
+                  type: string
+                masterURL:
+                  type: string
+                namespacePrefix:
+                  type: string
+                operatorsInProductNamespace:
+                  description: OperatorsInProductNamespace is a flag that decides if the product operators should be installed in the product namespace (when set to true) or in standalone namespace (when set to false, default). Standalone namespace will be used only for those operators that support it.
+                  type: boolean
+                pagerDutySecret:
+                  description: "PagerDutySecret is the name of a secret in the installation namespace containing PagerDuty account details. The secret must contain the following fields: \n serviceKey"
+                  type: string
+                priorityClassName:
+                  type: string
+                pullSecret:
+                  properties:
+                    name:
+                      type: string
+                    namespace:
+                      type: string
+                  required:
+                    - name
+                    - namespace
+                  type: object
+                rebalancePods:
+                  type: boolean
+                routingSubdomain:
+                  type: string
+                selfSignedCerts:
+                  type: boolean
+                smtpSecret:
+                  description: "SMTPSecret is the name of a secret in the installation namespace containing SMTP connection details. The secret must contain the following fields: \n host port tls username password"
+                  type: string
+                type:
+                  type: string
+                useClusterStorage:
+                  type: string
+              required:
+                - namespacePrefix
+                - type
+              type: object
+            status:
+              description: RHMIStatus defines the observed state of RHMI
+              properties:
+                customDomain:
+                  properties:
+                    enabled:
+                      type: boolean
+                    error:
+                      type: string
+                  required:
+                    - enabled
+                  type: object
+                customSmtp:
+                  properties:
+                    enabled:
+                      type: boolean
+                    error:
+                      type: string
+                  required:
+                    - enabled
+                  type: object
+                gitHubOAuthEnabled:
+                  type: boolean
+                lastError:
+                  type: string
+                preflightMessage:
+                  type: string
+                preflightStatus:
+                  type: string
+                quota:
+                  type: string
+                smtpEnabled:
+                  type: boolean
+                stage:
+                  type: string
+                stages:
+                  additionalProperties:
+                    properties:
+                      name:
+                        type: string
+                      phase:
+                        type: string
+                      products:
+                        additionalProperties:
+                          properties:
+                            host:
+                              type: string
+                            mobile:
+                              type: boolean
+                            name:
+                              type: string
+                            operator:
+                              type: string
+                            status:
+                              type: string
+                            type:
+                              type: string
+                            uninstall:
+                              type: boolean
+                            version:
+                              type: string
+                          required:
+                            - host
+                            - name
+                            - status
+                            - version
+                          type: object
+                        type: object
+                    required:
+                      - name
+                      - phase
+                    type: object
+                  description: 'INSERT ADDITIONAL STATUS FIELD - define observed state of cluster Important: Run "make" to regenerate code after modifying this file'
+                  type: object
+                toQuota:
+                  type: string
+                toVersion:
+                  type: string
+                version:
+                  type: string
+              required:
+                - lastError
+                - stage
+                - stages
+              type: object
+          type: object
+      served: true
+      storage: true
+      subresources:
+        status: {}
+  validation:
+    openAPIV3Schema:
+      description: RHOAM is the Schema for the RHOAM API
+      properties:
+        spec:
+          description: RHOAMSpec defines the desired state of Installation
+        status:
+          description: RHOAMStatus defines the observed state of Installation
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []

bundles/managed-api-service/1.42.0/manifests/rhmi-operator-metrics_monitoring.coreos.com_v1_servicemonitor.yaml

@@ -0,0 +1,13 @@
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  labels:
+    name: rhmi-operator
+  name: rhmi-operator-metrics
+spec:
+  endpoints:
+  - path: /metrics
+    port: http-metrics
+  selector:
+    matchLabels:
+      name: rhmi-operator

bundles/managed-api-service/1.42.0/manifests/rhoam-operator-metrics-service_v1_service.yaml

@@ -0,0 +1,16 @@
+apiVersion: v1
+kind: Service
+metadata:
+  creationTimestamp: null
+  labels:
+    name: rhmi-operator
+  name: rhoam-operator-metrics-service
+spec:
+  ports:
+  - name: http-metrics
+    port: 8383
+    targetPort: 8383
+  selector:
+    name: rhmi-operator
+status:
+  loadBalancer: {}

bundles/managed-api-service/1.42.0/metadata/annotations.yaml

@@ -0,0 +1,15 @@
+annotations:
+  # Core bundle annotations.
+  operators.operatorframework.io.bundle.mediatype.v1: registry+v1
+  operators.operatorframework.io.bundle.manifests.v1: manifests/
+  operators.operatorframework.io.bundle.metadata.v1: metadata/
+  operators.operatorframework.io.bundle.package.v1: managed-api-service
+  operators.operatorframework.io.bundle.channels.v1: stable
+  operators.operatorframework.io.bundle.channel.default.v1: stable
+  operators.operatorframework.io.metrics.builder: operator-sdk-v1.21.0
+  operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
+  operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v2
+
+  # Annotations for testing.
+  operators.operatorframework.io.test.mediatype.v1: scorecard+v1
+  operators.operatorframework.io.test.config.v1: tests/scorecard/

bundles/managed-api-service/1.42.0/tests/scorecard/config.yaml

@@ -0,0 +1,97 @@
+apiVersion: scorecard.operatorframework.io/v1alpha3
+kind: Configuration
+metadata:
+  name: config
+serviceaccount: rhoam-test-runner
+stages:
+- parallel: true
+  tests:
+  - entrypoint:
+    - scorecard-test
+    - basic-check-spec
+    image: quay.io/operator-framework/scorecard-test:v1.2.0
+    labels:
+      suite: basic
+      test: basic-check-spec-test
+    storage:
+      spec:
+        mountPath: {}
+  - entrypoint:
+    - scorecard-test
+    - olm-bundle-validation
+    image: quay.io/operator-framework/scorecard-test:v1.2.0
+    labels:
+      suite: olm
+      test: olm-bundle-validation-test
+    storage:
+      spec:
+        mountPath: {}
+  - entrypoint:
+    - scorecard-test
+    - olm-crds-have-validation
+    image: quay.io/operator-framework/scorecard-test:v1.2.0
+    labels:
+      suite: olm
+      test: olm-crds-have-validation-test
+    storage:
+      spec:
+        mountPath: {}
+  - entrypoint:
+    - scorecard-test
+    - olm-crds-have-resources
+    image: quay.io/operator-framework/scorecard-test:v1.2.0
+    labels:
+      suite: olm
+      test: olm-crds-have-resources-test
+    storage:
+      spec:
+        mountPath: {}
+  - entrypoint:
+    - scorecard-test
+    - olm-spec-descriptors
+    image: quay.io/operator-framework/scorecard-test:v1.2.0
+    labels:
+      suite: olm
+      test: olm-spec-descriptors-test
+    storage:
+      spec:
+        mountPath: {}
+  - entrypoint:
+    - scorecard-test
+    - olm-status-descriptors
+    image: quay.io/operator-framework/scorecard-test:v1.2.0
+    labels:
+      suite: olm
+      test: olm-status-descriptors-test
+    storage:
+      spec:
+        mountPath: {}
+  - entrypoint:
+    - entrypoint
+    - 01-happy-path
+    image: quay.io/integreatly/scorecard-test-kuttl:master
+    labels:
+      cluster-product: ocp
+      cluster-size: small
+      phase: msp-main
+      test: happy-path
+    storage:
+      spec:
+        mountPath:
+          path: logs/artifacts
+  - entrypoint:
+    - entrypoint
+    - 02-scalability
+    image: quay.io/integreatly/scorecard-test-kuttl:master
+    labels:
+      cluster-product: ocp
+      cluster-size: medium
+      phase: msp-main
+      test: scalability
+    storage:
+      spec:
+        mountPath:
+          path: logs/artifacts
+storage:
+  spec:
+    mountPath: {}

bundles/managed-api-service/managed-api-service.package.yaml

@@ -1,5 +1,5 @@
 channels:
-  - currentCSV: managed-api-service.v1.41.0
+  - currentCSV: managed-api-service.v1.42.0
     name: rhmi
 defaultChannel: rhmi
 packageName: managed-api-service

config/manifests-rhoam/bases/managed-api-service.clusterserviceversion.yaml

@@ -12,7 +12,7 @@ metadata:
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v2
     olm.properties: '[{"type": "olm.maxOpenShiftVersion", "value": "4.17"}]'
     support: RHOAM
-  name: managed-api-service.v1.41.0
+  name: managed-api-service.v1.42.0
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -118,5 +118,5 @@ spec:
     matchLabels:
       alm-owner-rhoam: rhoam-operator
       operated-by: rhoam-operator
-  version: 1.41.0
-  replaces: managed-api-service.v1.40.0
+  version: 1.42.0
+  replaces: managed-api-service.v1.41.0