Merge pull request #1950 from fridex/prescriptions-pickle

Start using prescriptions from pickle file
thoth-station · Sep 15, 2021 · e53128f · e53128f
2 parents 7509429 + fe94416
commit e53128f
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 75 deletions.
diff --git a/adviser/base/argo-workflows/advise.yaml b/adviser/base/argo-workflows/advise.yaml
@@ -102,14 +102,6 @@ spec:
               secretKeySecret:
                 name: argo-artifact-repository-secrets
                 key: secretKey
-      initContainers:
-        - name: prescriptions
-          image: prescriptions:latest
-          command:
-            - /bin/sh
-            - -c
-            - cp --recursive /opt/app-root/src/prescriptions/* /mnt/prescriptions/
-          mirrorVolumeMounts: true
       container:
         name: advise
         image: adviser:latest
@@ -133,7 +125,7 @@ spec:
           - name: THOTH_ADVISER_BLOCKED_UNITS
             value: "SecurityIndicatorStep"
           - name: THOTH_ADVISER_PRESCRIPTION
-            value: "/mnt/prescriptions/"
+            value: "/opt/app-root/src/prescriptions.pickle"
           - name: THOTH_ADVISER_REQUIREMENTS
             value: "input/Pipfile"
           - name: THOTH_ADVISER_REQUIREMENTS_LOCKED
@@ -221,8 +213,6 @@ spec:
         volumeMounts:
           - name: workdir
             mountPath: /mnt/workdir
-          - name: prescriptions
-            mountPath: /mnt/prescriptions
         resources:
           limits:
             cpu: 1.1

diff --git a/adviser/base/argo-workflows/dependency-monkey.yaml b/adviser/base/argo-workflows/dependency-monkey.yaml
@@ -70,14 +70,6 @@ spec:
               secretKeySecret:
                 name: argo-artifact-repository-secrets
                 key: secretKey
-      initContainers:
-        - name: prescriptions
-          image: prescriptions
-          command:
-            - /bin/sh
-            - -c
-            - cp --recursive /opt/app-root/src/prescriptions/* /mnt/prescriptions/
-          mirrorVolumeMounts: true
       container:
         name: dm
         image: adviser
@@ -109,7 +101,7 @@ spec:
           - name: THOTH_ADVISER_PIPELINE
             value: "input/pipeline.json"
           - name: THOTH_ADVISER_PRESCRIPTION
-            value: "/mnt/prescriptions/"
+            value: "/opt/app-root/src/prescriptions.pickle"
           - name: THOTH_ADVISER_PREDICTOR
             value: "{{inputs.parameters.THOTH_ADVISER_PREDICTOR}}"
           - name: THOTH_ADVISER_PREDICTOR_CONFIG
@@ -169,11 +161,6 @@ spec:
         volumeMounts:
           - name: workdir
             mountPath: /mnt/workdir
-          - name: prescriptions
-            mountPath: /mnt/prescriptions
-        volumes:
-          - name: prescriptions
-            emptyDir: {}
         resources:
           limits:
             cpu: 1.1

diff --git a/adviser/base/imagestream.yaml b/adviser/base/imagestream.yaml
@@ -6,11 +6,3 @@ metadata:
 spec:
   lookupPolicy:
     local: true
----
-apiVersion: image.openshift.io/v1
-kind: ImageStream
-metadata:
-  name: prescriptions
-spec:
-  lookupPolicy:
-    local: true
diff --git a/adviser/overlays/cnv-prod/imagestreamtag.yaml b/adviser/overlays/cnv-prod/imagestreamtag.yaml
@@ -12,17 +12,3 @@ spec:
       importPolicy: {}
       referencePolicy:
         type: Local
----
-apiVersion: image.openshift.io/v1
-kind: ImageStream
-metadata:
-  name: prescriptions
-spec:
-  tags:
-    - name: latest
-      from:
-        kind: DockerImage
-        name: quay.io/thoth-station/prescriptions:v0.8.0
-      importPolicy: {}
-      referencePolicy:
-        type: Local
diff --git a/adviser/overlays/ocp4-stage/imagestreamtag.yaml b/adviser/overlays/ocp4-stage/imagestreamtag.yaml
@@ -12,17 +12,3 @@ spec:
       importPolicy: {}
       referencePolicy:
         type: Local
----
-apiVersion: image.openshift.io/v1
-kind: ImageStream
-metadata:
-  name: prescriptions
-spec:
-  tags:
-    - name: latest
-      from:
-        kind: DockerImage
-        name: quay.io/thoth-station/prescriptions:v0.8.0
-      importPolicy: {}
-      referencePolicy:
-        type: Local
diff --git a/adviser/overlays/test/imagestreamtag.yaml b/adviser/overlays/test/imagestreamtag.yaml
@@ -11,17 +11,3 @@ spec:
       importPolicy: {}
       referencePolicy:
         type: Source
----
-apiVersion: image.openshift.io/v1
-kind: ImageStream
-metadata:
-  name: prescriptions
-spec:
-  tags:
-    - name: latest
-      from:
-        kind: DockerImage
-        name: quay.io/thoth-station/prescriptions:v0.8.0
-      importPolicy: {}
-      referencePolicy:
-        type: Source