Merge branch 'prune-devel' into devel

Author: juhanikataja

k8s-objs/app.yaml

@@ -1,5 +1,6 @@
 apiVersion: v1
 items:
+
 - apiVersion: image.openshift.io/v1
   kind: ImageStream
   metadata:
@@ -14,6 +15,7 @@ items:
       local: false
   status:
     dockerImageRepository: ""
+
 - apiVersion: build.openshift.io/v1
   kind: BuildConfig
   metadata:
@@ -54,6 +56,49 @@ items:
       type: ImageChange
   status:
     lastVersion: 0
+
+- apiVersion: build.openshift.io/v1
+  kind: BuildConfig
+  metadata:
+    annotations:
+      openshift.io/generated-by: OpenShiftNewApp
+    creationTimestamp: null
+    labels:
+      app: docs-preview-devel
+    name: docs-preview-devel
+  spec:
+    nodeSelector: null
+    output:
+      to:
+        kind: ImageStreamTag
+        name: docs-preview:devel
+    postCommit: {}
+    resources: {}
+    source:
+      git:
+        uri: https://github.com/juhanikataja/docs-preview
+        ref: devel
+      type: Git
+    strategy:
+      sourceStrategy:
+        from:
+          kind: ImageStreamTag
+          name: python:3.6
+          namespace: openshift
+      type: Source
+    triggers:
+    - github:
+        secret: UB9ISRSDLQefVs3BzEi3
+      type: GitHub
+    - generic:
+        secret: PpKuCO-gqmQMYgMBfFPC
+      type: Generic
+    - type: ConfigChange
+    - imageChange: {}
+      type: ImageChange
+  status:
+    lastVersion: 0
+
 - apiVersion: apps.openshift.io/v1
   kind: DeploymentConfig
   metadata:
@@ -141,13 +186,115 @@ items:
           kind: ImageStreamTag
           name: docs-preview:latest
       type: ImageChange
+
+- apiVersion: apps.openshift.io/v1
+  kind: DeploymentConfig
+  metadata:
+    annotations:
+      openshift.io/generated-by: OpenShiftNewApp
+    creationTimestamp: null
+    labels:
+      app: docs-preview-devel
+    name: docs-preview-devel
+  spec:
+    replicas: 1
+    selector:
+      app: docs-preview-devel
+      deploymentconfig: docs-preview-devel
+    strategy:
+      resources: {}
+    template:
+      metadata:
+        annotations:
+          openshift.io/generated-by: OpenShiftNewApp
+        creationTimestamp: null
+        labels:
+          app: docs-preview-devel
+          deploymentconfig: docs-preview-devel
+      spec:
+        volumes:
+        - name: content-vol
+          emptyDir: {}
+        - name: workpath
+          emptyDir: {}
+        - name: nginx-conf
+          configMap:
+            name: nginx-config
+        containers:
+        - image: bitnami/nginx:1.16-centos-7
+          name: web-server
+          ports: 
+          - containerPort: 8080
+            protocol: TCP
+          volumeMounts:
+          - mountPath: /app
+            name: content-vol
+          - mountPath: /opt/bitnami/nginx/conf/server_blocks
+            name: nginx-conf
+          resources:
+            limits:
+              cpu: "1"
+              memory: "2G"
+            requests:
+              cpu: "0.2"
+              memory: "200M"
+        - image: docs-preview:devel
+          name: docs-preview-devel
+          resources:
+            limits:
+              cpu: "1"
+              memory: "2G"
+            requests:
+              cpu: "0.2"
+              memory: "200M"
+          ports:
+          - containerPort: 8081
+            protocol: TCP
+          env:
+          - name: WORKPATH
+            value: /work
+          - name: BUILDROOT
+            value: /builds
+          - name: BUILDSECRET
+            value: "csc-build-secret"
+          volumeMounts:
+          - mountPath: /builds
+            name: content-vol
+          - mountPath: /work
+            name: workpath
+    test: false
+    triggers:
+    - type: ConfigChange
+    - imageChangeParams:
+        automatic: true
+        containerNames:
+        - docs-preview
+        from:
+          kind: ImageStreamTag
+          name: docs-preview:devel
+      type: ImageChange
+
+- apiVersion: v1
+  kind: Service
+  metadata:
+    annotations:
+      openshift.io/generated-by: OpenShiftNewApp
+    creationTimestamp: null
+    labels:
+      app: docs-preview-devel
+    name: docs-preview-devel-hook
+  spec:
+    ports:
+    - name: 8081-tcp
+      port: 8081
+      protocol: TCP
+      targetPort: 8081
+    selector:
+      app: docs-preview-devel
+      deploymentconfig: docs-preview-devel
   status:
-    availableReplicas: 0
-    latestVersion: 0
-    observedGeneration: 0
-    replicas: 0
-    unavailableReplicas: 0
-    updatedReplicas: 0
+    loadBalancer: {}
+
 - apiVersion: v1
   kind: Service
   metadata:
@@ -168,6 +315,7 @@ items:
       deploymentconfig: docs-preview
   status:
     loadBalancer: {}
+
 - apiVersion: v1
   kind: Service
   metadata:
@@ -189,6 +337,27 @@ items:
   status:
     loadBalancer: {}
 
+- apiVersion: v1
+  kind: Service
+  metadata:
+    annotations:
+      openshift.io/generated-by: OpenShiftNewApp
+    creationTimestamp: null
+    labels:
+      app: docs-preview-devel
+    name: docs-preview-devel
+  spec:
+    ports:
+    - name: 8080-tcp
+      port: 8080
+      protocol: TCP
+      targetPort: 8080
+    selector:
+      app: docs-preview-devel
+      deploymentconfig: docs-preview-devel
+  status:
+    loadBalancer: {}
+
 - kind: ConfigMap
   apiVersion: v1
   metadata: