[RHDM-764] revert addition of optaweb extension image (#147)

jboss-container-images · Nov 14, 2018 · b0f1061 · b0f1061
1 parent e8710f8
commit b0f1061
Showing 1 changed file with 5 additions and 72 deletions.
diff --git a/templates/optaweb/rhdm72-optaweb-employee-rostering-externaldb.yaml b/templates/optaweb/rhdm72-optaweb-employee-rostering-externaldb.yaml
@@ -67,7 +67,7 @@ parameters:
   name: OPTAWEB_PERSISTENCE_HBM2DDL_AUTO
   example: update
   required: false
-- displayName: Optaweb Empl yee Rostering Persistence Schema
+- displayName: Optaweb Employee Rostering Persistence Schema
   description: Hibernate persistence schema.
   name: OPTAWEB_PERSISTENCE_SCHEMA
   example: db.schema
@@ -77,7 +77,7 @@ parameters:
   name: OPTAWEB_EXTERNALDB_DIALECT
   example: "org.hibernate.dialect.MySQL5Dialect"
   required: true
-- displayName: Optaweb Empl yee Rostering External Database Host
+- displayName: Optaweb Employee Rostering External Database Host
   description: Optaweb employee rostering external database host
   name: OPTAWEB_EXTERNALDB_HOST
   required: false
@@ -148,23 +148,6 @@ parameters:
   example: "4"
   required: false
 ## External database parameters END
-## Extension image configuration BEGIN
-- displayName: Drivers Extension Image
-  description: ImageStreamTag definition for the image containing the drivers and configuration. i.e custom-driver-image:1.0
-  name: EXTENSIONS_IMAGE
-  value: custom-driver-extension:1.0
-  required: true
-- displayName: Drivers ImageStream Namespace
-  description: Namespace within which the ImageStream definition for the image containing the drivers and configuration is located.
-  name: EXTENSIONS_IMAGE_NAMESPACE
-  value: openshift
-  required: true
-- displayName: Drivers Image Install Directory
-  description: Full path to the directory within the extensions image where the extensions are located (e.g. install.sh, modules/, etc.)
-  name: EXTENSIONS_INSTALL_DIR
-  value: "/extensions"
-  required: true
-## Extension image configuration END
 - displayName: Optaweb Employee Rostering Custom http Route Hostname
   description: 'Custom hostname for http service route, if set will also configure the OPTAWEB_HOST. Leave blank for default hostname,
     e.g.: <application-name>-optaweb-employee-rostering-<project>.<default-domain-suffix>'
@@ -296,57 +279,6 @@ objects:
       targetPort: https
     tls:
       termination: passthrough
-- kind: ImageStream
-  apiVersion: v1
-  metadata:
-    name: "${APPLICATION_NAME}-optaweb-employee-rostering"
-    labels:
-      application: "${APPLICATION_NAME}"
-      service: "${APPLICATION_NAME}-optaweb-employee-rostering"
-- kind: BuildConfig
-  apiVersion: v1
-  metadata:
-    name: "${APPLICATION_NAME}-optaweb-employee-rostering"
-    labels:
-      application: "${APPLICATION_NAME}"
-      service: "${APPLICATION_NAME}-optaweb-employee-rostering"
-    annotations:
-      template.alpha.openshift.io/wait-for-ready: "true"
-  spec:
-    source:
-      images:
-      - from:
-          kind: ImageStreamTag
-          namespace: "${EXTENSIONS_IMAGE_NAMESPACE}"
-          name: "${EXTENSIONS_IMAGE}"
-        paths:
-        - destinationDir: "./extensions/extras"
-          sourcePath: "${EXTENSIONS_INSTALL_DIR}/."
-    strategy:
-      type: Source
-      sourceStrategy:
-        env:
-        - name: CUSTOM_INSTALL_DIRECTORIES
-          value: "extensions/*"
-        forcePull: true
-        from:
-          kind: ImageStreamTag
-          namespace: "${IMAGE_STREAM_NAMESPACE}"
-          name: "${OPTAWEB_IMAGE_STREAM_NAME}:${IMAGE_STREAM_TAG}"
-    output:
-      to:
-        kind: ImageStreamTag
-        name: "${APPLICATION_NAME}-optaweb-employee-rostering:latest"
-    triggers:
-    - type: ImageChange
-      imageChange: {}
-    - type: ImageChange
-      imageChange:
-        from:
-          kind: ImageStreamTag
-          namespace: "${EXTENSIONS_IMAGE_NAMESPACE}"
-          name: "${EXTENSIONS_IMAGE}"
-    - type: ConfigChange
 - kind: DeploymentConfig
   apiVersion: v1
   metadata:
@@ -366,8 +298,9 @@ objects:
         containerNames:
         - "${APPLICATION_NAME}-optaweb-employee-rostering"
         from:
-          kind: ImageStream
-          name: "${APPLICATION_NAME}-optaweb-employee-rostering"
+          kind: ImageStreamTag
+          namespace: "${IMAGE_STREAM_NAMESPACE}"
+          name: "${OPTAWEB_IMAGE_STREAM_NAME}:${IMAGE_STREAM_TAG}"
     - type: ConfigChange
     replicas: 1
     selector: