prepare for release 2.2.1-rc1

integr8ly · May 25, 2020 · bbda7d6 · bbda7d6
1 parent d574a11
commit bbda7d6
Show file tree

Hide file tree

Showing 6 changed files with 700 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -5,7 +5,7 @@ NAMESPACE=redhat-rhmi-operator
 PROJECT=integreatly-operator
 REG=quay.io
 SHELL=/bin/bash
-TAG ?= 2.2.0
+TAG ?= 2.2.1
 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/...catalog/integreatly-operator/2.2.1/integreatly-operator.v2.2.1.clusterserviceversion.yaml b/...catalog/integreatly-operator/2.2.1/integreatly-operator.v2.2.1.clusterserviceversion.yaml
diff --git a/deploy/olm-catalog/integreatly-operator/2.2.1/integreatly.org_rhmiconfigs_crd.yaml b/deploy/olm-catalog/integreatly-operator/2.2.1/integreatly.org_rhmiconfigs_crd.yaml
@@ -0,0 +1,100 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: rhmiconfigs.integreatly.org
+spec:
+  group: integreatly.org
+  names:
+    kind: RHMIConfig
+    listKind: RHMIConfigList
+    plural: rhmiconfigs
+    singular: rhmiconfig
+  scope: Namespaced
+  subresources:
+    status: {}
+  validation:
+    openAPIV3Schema:
+      description: RHMIConfig is the Schema for the rhmiconfigs 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: RHMIConfigSpec defines the desired state of RHMIConfig
+          properties:
+            backup:
+              properties:
+                applyOn:
+                  description: 'apply-on: string, day time. Format: "DDD hh:mm" >
+                    "wed 20:00". UTC time'
+                  type: string
+              type: object
+            maintenance:
+              properties:
+                applyFrom:
+                  description: 'apply-from: string, day time. Currently this is a
+                    6 hour window. Format: "DDD hh:mm" > "sun 23:00". UTC time'
+                  type: string
+              type: object
+            upgrade:
+              description: 'configure when we will apply upgrades of RHMI to the cluster'
+              properties:
+                alwaysImmediately:
+                  description: 'always-immediately: boolean value, if set to true
+                    an upgrade will be applied as soon as it is available, whether
+                    service affecting or not. This takes precedences over all other
+                    options'
+                  type: boolean
+                applyOn:
+                  description: 'apply-on: string date value. If ''always-immediately''
+                    or ''during-next-maintenance'' is not set the customer is required
+                    to pick a time for the upgrade. Time value will be validated by
+                    a webhook and reset to blank after upgrade has completed. Format:
+                    "dd MMM YYYY hh:mm" > "12 Jan 1980 23:00". UTC time'
+                  type: string
+                contacts:
+                  description: 'contacts: list of contacts which are comma separated
+                    "user1@example.com,user2@example.com"'
+                  type: string
+                duringNextMaintenance:
+                  description: 'during-next-maintenance: boolean value, if set to
+                    true an upgrade will be applied within the next maintenance window.
+                    Takes precedence over apply-on'
+                  type: boolean
+              required:
+              - alwaysImmediately
+              - duringNextMaintenance
+              type: object
+          type: object
+        status:
+          description: RHMIConfigStatus defines the observed state of RHMIConfig
+          properties:
+            maintenance:
+              description: 'configure when we will apply OSD maintenance to the cluster'
+              properties:
+                applyFrom:
+                  type: string
+                duration:
+                  type: string
+              type: object
+            upgrade:
+              properties:
+                window:
+                  type: string
+              type: object
+          type: object
+      type: object
+  version: v1alpha1
+  versions:
+  - name: v1alpha1
+    served: true
+    storage: true
diff --git a/deploy/olm-catalog/integreatly-operator/2.2.1/integreatly.org_rhmis_crd.yaml b/deploy/olm-catalog/integreatly-operator/2.2.1/integreatly.org_rhmis_crd.yaml
@@ -0,0 +1,151 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: rhmis.integreatly.org
+spec:
+  group: integreatly.org
+  names:
+    kind: RHMI
+    listKind: RHMIList
+    plural: rhmis
+    singular: rhmi
+  scope: Namespaced
+  subresources:
+    status: {}
+  validation:
+    openAPIV3Schema:
+      description: RHMI is the Schema for the RHMI 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 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:
+              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
+            pullSecret:
+              properties:
+                name:
+                  type: string
+                namespace:
+                  type: string
+              required:
+              - name
+              - namespace
+              type: object
+            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:
+              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'
+              type: string
+            useClusterStorage:
+              type: string
+          required:
+          - namespacePrefix
+          - type
+          type: object
+        status:
+          description: RHMIStatus defines the observed state of Installation
+          properties:
+            gitHubOAuthEnabled:
+              type: boolean
+            lastError:
+              type: string
+            preflightMessage:
+              type: string
+            preflightStatus:
+              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
+                        version:
+                          type: string
+                      required:
+                      - host
+                      - name
+                      - status
+                      - version
+                      type: object
+                    type: object
+                required:
+                - name
+                - phase
+                type: object
+              description: 'INSERT ADDITIONAL STATUS FIELDS - 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: object
+          required:
+          - lastError
+          - stage
+          - stages
+          type: object
+      type: object
+  version: v1alpha1
+  versions:
+  - name: v1alpha1
+    served: true
+    storage: true
diff --git a/deploy/olm-catalog/integreatly-operator/integreatly-operator.package.yaml b/deploy/olm-catalog/integreatly-operator/integreatly-operator.package.yaml
diff --git a/version/version.go b/version/version.go
@@ -1,6 +1,6 @@
 package version
 
 var (
-	Version            = "2.2.0"
-	IntegreatlyVersion = "2.2.0"
+	Version            = "2.2.1"
+	IntegreatlyVersion = "2.2.1"
 )