Merge pull request #301 from tchughesiv/merge1.2.1

Merge 1.2.1 into `release-1.2.x` branch

Makefile

@@ -64,6 +64,10 @@ rhel-scratch:
 rhel-release:
 	./hack/go-build.sh rhel release
 
+.PHONY: csv
+csv:
+	go run ./tools/csv-gen/csv-gen.go
+
 .PHONY: clean
 clean:
 	rm -rf build/_output \

README.md

@@ -29,14 +29,26 @@ To install this operator on OpenShift 4 for end-to-end testing, make sure you ha
 Push the operator bundle to your quay application repository as follows:
 
 ```bash
-operator-courier push deploy/catalog_resources/courier/bundle_dir/1.2.0 kiegroup kiecloud-operator 1.2.0 "basic XXXXXXXXX"
-# operator-courier push deploy/catalog_resources/courier/bundle_dir/1.1.1 kiegroup kiecloud-operator 1.1.1 "basic XXXXXXXXX"
+REGISTRY_NS=<registry namespace in quay.io>
+operator-courier push deploy/catalog_resources/community ${REGISTRY_NS} kiecloud-operator $(go run getversion.go -operator) "basic XXXXXXXXX"
 ```
 
 If pushing to another quay repository, replace _kiegroup_ with your username or other namespace. Also note that the push command does not overwrite an existing repository, and it needs to be deleted before a new version can be built and uploaded. Once the bundle has been uploaded, create an [Operator Source](https://github.com/operator-framework/community-operators/blob/master/docs/testing-operators.md#linking-the-quay-application-repository-to-your-openshift-40-cluster) to load your operator bundle in OpenShift.
 
 ```bash
-oc create -f deploy/catalog_resources/courier/kiecloud-operatorsource.yaml
+oc create -f - <<EOF
+apiVersion: operators.coreos.com/v1
+kind: OperatorSource
+metadata:
+  name: kiecloud-operators
+  namespace: openshift-marketplace
+spec:
+  type: appregistry
+  endpoint: https://quay.io/cnr
+  registryNamespace: ${REGISTRY_NS}
+  displayName: "KIE Cloud Operators"
+  publisher: "Red Hat"
+EOF
 ```
 
 Remember to replace _registryNamespace_ with your quay namespace. The name, display name and publisher of the operator are the only other attributes that may be modified.

config/7.4.0/common.yaml → config/7.5.1/common.yaml

@@ -54,10 +54,10 @@ console:
                     path: /rest/ready
                     port: 8080
                     scheme: HTTP
-                  initialDelaySeconds: 60
+                  initialDelaySeconds: 30
                   timeoutSeconds: 2
-                  periodSeconds: 30
-                  failureThreshold: 6
+                  periodSeconds: 5
+                  failureThreshold: 36
                 ports:
                   - name: jolokia
                     containerPort: 8778
@@ -72,6 +72,10 @@ console:
                     containerPort: 8888
                     protocol: TCP
                 env:
+                  - name: APPLICATION_USERS_PROPERTIES
+                    value: "/opt/kie/data/configuration/application-users.properties"
+                  - name: APPLICATION_ROLES_PROPERTIES
+                    value: "/opt/kie/data/configuration/application-roles.properties"
                   - name: KIE_ADMIN_USER
                     value: "[[.AdminUser]]"
                   - name: KIE_ADMIN_PWD
@@ -662,10 +666,10 @@ servers:
                       path: /services/rest/server/readycheck
                       port: 8080
                       scheme: HTTP
-                    initialDelaySeconds: 60
+                    initialDelaySeconds: 30
                     timeoutSeconds: 2
-                    periodSeconds: 30
-                    failureThreshold: 6
+                    periodSeconds: 5
+                    failureThreshold: 36
                   ports:
                     - name: jolokia
                       containerPort: 8778