Skip to content

Commit

Permalink
Merge pull request #1950 from fridex/prescriptions-pickle
Browse files Browse the repository at this point in the history
Start using prescriptions from pickle file
  • Loading branch information
sesheta committed Sep 15, 2021
2 parents 7509429 + fe94416 commit e53128f
Show file tree
Hide file tree
Showing 6 changed files with 2 additions and 75 deletions.
12 changes: 1 addition & 11 deletions adviser/base/argo-workflows/advise.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -221,8 +213,6 @@ spec:
volumeMounts:
- name: workdir
mountPath: /mnt/workdir
- name: prescriptions
mountPath: /mnt/prescriptions
resources:
limits:
cpu: 1.1
Expand Down
15 changes: 1 addition & 14 deletions adviser/base/argo-workflows/dependency-monkey.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
8 changes: 0 additions & 8 deletions adviser/base/imagestream.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,3 @@ metadata:
spec:
lookupPolicy:
local: true
---
apiVersion: image.openshift.io/v1
kind: ImageStream
metadata:
name: prescriptions
spec:
lookupPolicy:
local: true
14 changes: 0 additions & 14 deletions adviser/overlays/cnv-prod/imagestreamtag.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
14 changes: 0 additions & 14 deletions adviser/overlays/ocp4-stage/imagestreamtag.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
14 changes: 0 additions & 14 deletions adviser/overlays/test/imagestreamtag.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit e53128f

Please sign in to comment.