From 78a5a8cb8cf036fcf6cbc0fdcd9d6cb7a409691f Mon Sep 17 00:00:00 2001 From: Fridolin Pokorny Date: Tue, 14 Sep 2021 09:32:49 +0200 Subject: [PATCH] Start using prescriptions from pickle file --- adviser/base/argo-workflows/advise.yaml | 12 +----------- adviser/base/imagestream.yaml | 8 -------- adviser/overlays/cnv-prod/imagestreamtag.yaml | 14 -------------- adviser/overlays/ocp4-stage/imagestreamtag.yaml | 14 -------------- adviser/overlays/test/imagestreamtag.yaml | 14 -------------- 5 files changed, 1 insertion(+), 61 deletions(-) diff --git a/adviser/base/argo-workflows/advise.yaml b/adviser/base/argo-workflows/advise.yaml index b1a4dc41f..501765b85 100644 --- 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/imagestream.yaml b/adviser/base/imagestream.yaml index 46ff167b9..0c75854f1 100644 --- 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 index fa2836aba..93ef3c26f 100644 --- 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.7.0 - importPolicy: {} - referencePolicy: - type: Local diff --git a/adviser/overlays/ocp4-stage/imagestreamtag.yaml b/adviser/overlays/ocp4-stage/imagestreamtag.yaml index fa2836aba..93ef3c26f 100644 --- 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.7.0 - importPolicy: {} - referencePolicy: - type: Local diff --git a/adviser/overlays/test/imagestreamtag.yaml b/adviser/overlays/test/imagestreamtag.yaml index 0486fcc9c..17a53e70d 100644 --- 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.7.0 - importPolicy: {} - referencePolicy: - type: Source