From 4eb3650bc0d8465aee5bed20f37e9b65ee15d292 Mon Sep 17 00:00:00 2001 From: Oleg Matskiv Date: Thu, 5 Mar 2020 17:57:15 +0100 Subject: [PATCH] release 2.0.0-er3 --- Makefile | 4 +-- ...perator.v2.0.0.clusterserviceversion.yaml} | 25 ++++++++++++++----- .../integreatly.org_rhmis_crd.yaml | 15 ++++++++++- .../integreatly-operator.package.yaml | 2 +- deploy/operator.yaml | 2 +- version/version.go | 2 +- 6 files changed, 38 insertions(+), 12 deletions(-) rename deploy/olm-catalog/integreatly-operator/{integreatly-operator-1.19.0/integreatly-operator.v1.19.0.clusterserviceversion.yaml => integreatly-operator-2.0.0/integreatly-operator.v2.0.0.clusterserviceversion.yaml} (98%) rename deploy/olm-catalog/integreatly-operator/{integreatly-operator-1.19.0 => integreatly-operator-2.0.0}/integreatly.org_rhmis_crd.yaml (88%) diff --git a/Makefile b/Makefile index 184b0cab9b..55163f0504 100644 --- a/Makefile +++ b/Makefile @@ -5,8 +5,8 @@ NAMESPACE=redhat-rhmi-operator PROJECT=integreatly-operator REG=quay.io SHELL=/bin/bash -PREVIOUS_TAG=1.18.0 -TAG=1.19.0 +PREVIOUS_TAG=1.19.0 +TAG=2.0.0 PKG=github.com/integr8ly/integreatly-operator TEST_DIRS?=$(shell sh -c "find $(TOP_SRC_DIRS) -name \\*_test.go -exec dirname {} \\; | sort | uniq") TEST_POD_NAME=integreatly-operator-test diff --git a/deploy/olm-catalog/integreatly-operator/integreatly-operator-1.19.0/integreatly-operator.v1.19.0.clusterserviceversion.yaml b/deploy/olm-catalog/integreatly-operator/integreatly-operator-2.0.0/integreatly-operator.v2.0.0.clusterserviceversion.yaml similarity index 98% rename from deploy/olm-catalog/integreatly-operator/integreatly-operator-1.19.0/integreatly-operator.v1.19.0.clusterserviceversion.yaml rename to deploy/olm-catalog/integreatly-operator/integreatly-operator-2.0.0/integreatly-operator.v2.0.0.clusterserviceversion.yaml index 78f1e4d4ff..f26f8186a0 100644 --- a/deploy/olm-catalog/integreatly-operator/integreatly-operator-1.19.0/integreatly-operator.v1.19.0.clusterserviceversion.yaml +++ b/deploy/olm-catalog/integreatly-operator/integreatly-operator-2.0.0/integreatly-operator.v2.0.0.clusterserviceversion.yaml @@ -11,8 +11,10 @@ metadata: "name": "INSTALLATION_NAME" }, "spec": { + "deadMansSnitchSecret": "INSTALLATION_PREFIX-deadmanssnitch", "namespacePrefix": "INSTALLATION_PREFIX-", "operatorsInProductNamespace": "OPERATORS_IN_PRODUCT_NAMESPACE", + "pagerdutySecret": "INSTALLATION_PREFIX-pagerduty", "selfSignedCerts": "SELF_SIGNED_CERTS", "smtpSecret": "INSTALLATION_PREFIX-smtp", "type": "INSTALLATION_TYPE", @@ -26,28 +28,30 @@ metadata: "name": "example-rhmi" }, "spec": { + "deadMansSnitchSecret": "redhat-rhmi-deadmanssnitch", "namespacePrefix": "redhat-rhmi-", + "pagerdutySecret": "redhat-rhmi-pagerduty", "selfSignedCerts": true, "smtpSecret": "redhat-rhmi-smtp", "type": "managed", - "useClusterStorage": true + "useClusterStorage": "true" } } ] capabilities: Basic Install categories: RHMI integration certified: "false" - containerImage: quay.io/integreatly/integreatly-operator:v1.19.0 + containerImage: quay.io/integreatly/integreatly-operator:v2.0.0-er3 createdAt: "2019-10-15 10:39:00" description: RHMI integration suite of tools support: RHMI - name: integreatly-operator.v1.19.0 + name: integreatly-operator.v2.0.0 namespace: placeholder spec: apiservicedefinitions: {} customresourcedefinitions: owned: - - description: Represents an installation of RHMI. + - description: RHMI is the Schema for the RHMI API kind: RHMI name: rhmis.integreatly.org version: v1alpha1 @@ -68,6 +72,15 @@ spec: - '*' verbs: - '*' + - apiGroups: + - console.openshift.io + resources: + - consolelinks + verbs: + - get + - create + - update + - delete - apiGroups: - "" - project.openshift.io @@ -257,7 +270,7 @@ spec: value: rhmi-operator - name: USE_CLUSTER_STORAGE value: "true" - image: quay.io/integreatly/integreatly-operator:v1.19.0 + image: quay.io/integreatly/integreatly-operator:v2.0.0-er3 imagePullPolicy: Always name: rhmi-operator resources: {} @@ -367,4 +380,4 @@ spec: matchLabels: alm-owner-rhmi: rhmi-operator operated-by: rhmi-operator - version: 1.19.0 + version: 2.0.0 diff --git a/deploy/olm-catalog/integreatly-operator/integreatly-operator-1.19.0/integreatly.org_rhmis_crd.yaml b/deploy/olm-catalog/integreatly-operator/integreatly-operator-2.0.0/integreatly.org_rhmis_crd.yaml similarity index 88% rename from deploy/olm-catalog/integreatly-operator/integreatly-operator-1.19.0/integreatly.org_rhmis_crd.yaml rename to deploy/olm-catalog/integreatly-operator/integreatly-operator-2.0.0/integreatly.org_rhmis_crd.yaml index 73b181e8d9..2f6b1e8ed2 100644 --- a/deploy/olm-catalog/integreatly-operator/integreatly-operator-1.19.0/integreatly.org_rhmis_crd.yaml +++ b/deploy/olm-catalog/integreatly-operator/integreatly-operator-2.0.0/integreatly.org_rhmis_crd.yaml @@ -31,6 +31,11 @@ spec: spec: description: RHMISpec defines the desired state of Installation properties: + 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: @@ -42,6 +47,11 @@ spec: 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 pullSecret: properties: name: @@ -68,7 +78,7 @@ spec: https://book.kubebuilder.io/beyond_basics/generating_crd.html' type: string useClusterStorage: - type: boolean + type: string required: - namespacePrefix - type @@ -86,6 +96,8 @@ spec: type: string smtpEnabled: type: boolean + stage: + type: string stages: additionalProperties: properties: @@ -128,6 +140,7 @@ spec: type: object required: - lastError + - stage - stages type: object type: object diff --git a/deploy/olm-catalog/integreatly-operator/integreatly-operator.package.yaml b/deploy/olm-catalog/integreatly-operator/integreatly-operator.package.yaml index 1e01477f08..5694c872ca 100644 --- a/deploy/olm-catalog/integreatly-operator/integreatly-operator.package.yaml +++ b/deploy/olm-catalog/integreatly-operator/integreatly-operator.package.yaml @@ -1,5 +1,5 @@ channels: -- currentCSV: integreatly-operator.v1.19.0 +- currentCSV: integreatly-operator.v2.0.0 name: rhmi defaultChannel: rhmi packageName: integreatly diff --git a/deploy/operator.yaml b/deploy/operator.yaml index 7611004e0a..f357d16a69 100644 --- a/deploy/operator.yaml +++ b/deploy/operator.yaml @@ -16,7 +16,7 @@ spec: containers: - name: rhmi-operator # Replace this with the built image name - image: quay.io/integreatly/integreatly-operator:v1.19.0 + image: quay.io/integreatly/integreatly-operator:v2.0.0-er3 command: - rhmi-operator imagePullPolicy: Always diff --git a/version/version.go b/version/version.go index eaaa64f900..c07b844b6c 100644 --- a/version/version.go +++ b/version/version.go @@ -1,6 +1,6 @@ package version var ( - Version = "1.19.0" + Version = "2.0.0" IntegreatlyVersion = "2.0.0" )