Revert "Migrate DeploymentConfigs to Deployments"

This reverts commit 312c186.

.gitignore

@@ -3,7 +3,6 @@
 
 # Files created by the scripts from; https://github.com/BCDevOps/openshift-project-tools
 *_DeploymentConfig.json
-*_Deployment.json
 *_BuildConfig.json
 *.local.*
 __pycache__

openshift/templates/audit/audit-deploy.overrides.sh

@@ -15,7 +15,7 @@ CONFIG_MAP_NAME=audit-conf
 SOURCE_FILE=$( dirname "$0" )/../../../docker/audit.conf
 
 OUTPUT_FORMAT=json
-OUTPUT_FILE=${CONFIG_MAP_NAME}-configmap_Deployment.json
+OUTPUT_FILE=${CONFIG_MAP_NAME}-configmap_DeploymentConfig.json
 
 printStatusMsg "Generating ConfigMap; ${CONFIG_MAP_NAME} ..."
 generateConfigMap "${CONFIG_MAP_NAME}" "${SOURCE_FILE}" "${OUTPUT_FORMAT}" "${OUTPUT_FILE}"
@@ -97,4 +97,4 @@ else
 fi
 
 SPECIALDEPLOYPARMS="--param-file=${_overrideParamFile}"
-echo ${SPECIALDEPLOYPARMS}
+echo ${SPECIALDEPLOYPARMS}

openshift/templates/audit/audit-deploy.yaml

@@ -52,8 +52,8 @@ objects:
       ${ORGBOOK_WALLET_DB_PASSWORD_KEY_NAME}: ${ORGBOOK_WALLET_DB_PASSWORD}
     type: Opaque
 
-  - kind: Deployment
-    apiVersion: apps/v1
+  - kind: DeploymentConfig
+    apiVersion: v1
     metadata:
       name: ${NAME}${SUFFIX}
       labels:
@@ -66,10 +66,20 @@ objects:
     spec:
       strategy:
         type: Recreate
+      triggers:
+        - type: ConfigChange
+        - type: ImageChange
+          imageChangeParams:
+            automatic: true
+            containerNames:
+              - ${NAME}${SUFFIX}
+            from:
+              kind: ImageStreamTag
+              namespace: ${IMAGE_NAMESPACE}
+              name: ${SOURCE_IMAGE_NAME}:${TAG_NAME}
       replicas: 1
       selector:
-        matchLabels:
-          name: ${NAME}${SUFFIX}
+        name: ${NAME}${SUFFIX}
       template:
         metadata:
           name: ${NAME}${SUFFIX}
@@ -94,7 +104,7 @@ objects:
                 - /bin/bash
                 - -c
                 - "./run.sh"
-              image: image-registry.openshift-image-registry.svc:5000/${IMAGE_NAMESPACE}/${NAME}:${TAG_NAME}
+              image: ""
               ports: []
               env: