🔀 Merge remote-tracking branch 'grdryn/INTLY-4497'

CHANGELOG.md

@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## Unreleased
 
+## [0.4.1] - 2019-12-11
+### Fixed
+- UnifiedPushDatabaseDown alert always fired if using external database
+
 ## [0.4.0] - 2019-12-03
 ### Added
 - UnifiedpushServer CRs can contain coordinates for an external PostgreSQL database

deploy/olm-catalog/unifiedpush-operator/0.4.1/push_v1alpha1_unifiedpushserver_crd.yaml

@@ -0,0 +1,142 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: unifiedpushservers.push.aerogear.org
+spec:
+  group: push.aerogear.org
+  names:
+    kind: UnifiedPushServer
+    listKind: UnifiedPushServerList
+    plural: unifiedpushservers
+    shortNames:
+    - ups
+    singular: unifiedpushserver
+  scope: Namespaced
+  subresources:
+    status: {}
+  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:
+            backups:
+              description: Backups is an array of configs that will be used to create
+                CronJob resource instances
+              items:
+                properties:
+                  backendSecretName:
+                    description: BackendSecretName is the name of a secret containing
+                      storage backend details, such as "AWS_S3_BUCKET_NAME", "AWS_ACCESS_KEY_ID",
+                      and "AWS_SECRET_ACCESS_KEY"
+                    type: string
+                  backendSecretNamespace:
+                    description: BackendSecretNamespace is the name of the namespace
+                      that the secret referenced in BackendSecretName resides in
+                    type: string
+                  encryptionKeySecretName:
+                    description: EncryptionKeySecretName is the name of a secret containing
+                      PGP/GPG details, including "GPG_PUBLIC_KEY", "GPG_TRUST_MODEL",
+                      and "GPG_RECIPIENT"
+                    type: string
+                  encryptionKeySecretNamespace:
+                    description: EncryptionKeySecretNamespace is the name of the namespace
+                      that the secret referenced in EncryptionKeySecretName resides
+                      in
+                    type: string
+                  name:
+                    description: Name is the name that will be given to the resulting
+                      CronJob
+                    type: string
+                  schedule:
+                    description: Schedule is the schedule that the job will be run
+                      at, in cron format
+                    type: string
+                required:
+                - name
+                - schedule
+                - backendSecretName
+                type: object
+              type: array
+            database:
+              properties:
+                host:
+                  description: Host for external database support
+                  type: string
+                name:
+                  description: Name for external database support
+                  type: string
+                password:
+                  description: Password for external database support
+                  type: string
+                port:
+                  anyOf:
+                  - type: string
+                  - type: integer
+                  description: Port for external database support
+                user:
+                  description: User for external database support
+                  type: string
+              type: object
+            externalDB:
+              description: ExternalDB can be set to true to use details from Database
+                and connect to external db
+              type: boolean
+            oAuthResourceRequirements:
+              type: object
+            postgresPVCSize:
+              description: PVC size for Postgres service
+              type: string
+            postgresResourceRequirements:
+              type: object
+            unifiedPushResourceRequirements:
+              type: object
+            useMessageBroker:
+              description: UseMessageBroker can be set to true to use managed queues,
+                if you are using enmasse. Defaults to false.
+              type: boolean
+          type: object
+        status:
+          properties:
+            message:
+              description: Message is a more human-readable message indicating details
+                about current phase or error.
+              type: string
+            phase:
+              description: Phase indicates whether the CR is reconciling(good), failing(bad),
+                or initializing.
+              type: string
+            ready:
+              description: Ready is True if all resources are in a ready state and
+                all work is done (phase should be "reconciling"). The type in the
+                Go code here is deliberately a pointer so that we can distinguish
+                between false and "not set", since it's an optional field.
+              type: boolean
+            secondaryResources:
+              additionalProperties:
+                items:
+                  type: string
+                type: array
+              description: 'SecondaryResources is a map of all the secondary resources
+                types and names created for this CR.  e.g "Deployment": [ "DeploymentName1",
+                "DeploymentName2" ]'
+              type: object
+          required:
+          - phase
+          type: object
+  version: v1alpha1
+  versions:
+  - name: v1alpha1
+    served: true
+    storage: true