Skip to content

Commit 7de7ef4

Browse files
harshad16harshad16
authored
⬆️ bump up the module for the release of 05.24.2021 (#1411)
Signed-off-by: Harshad Reddy Nalla <[email protected]>
1 parent d41f263 commit 7de7ef4

File tree

16 files changed

+170
-530
lines changed

16 files changed

+170
-530
lines changed

‎advise-reporter/overlays/cnv-prod/imagestreamtag.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ spec:
77
- name: latest
88
from:
99
kind: DockerImage
10-
name: quay.io/thoth-station/advise-reporter:v0.7.4
10+
name: quay.io/thoth-station/advise-reporter:v0.9.0
1111
importPolicy: {}
1212
referencePolicy:
1313
type: Local

‎amun/base/kustomization.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ resources:
1010
- argo-workflows/inspection-run.yaml
1111
- argo-workflows/inspection-run-with-cpu.yaml
1212
- argo-workflows/create-inspection-complete-message.yaml
13+
- argo-workflows/send-messages.yaml
1314
- openshift-templates/inspection-workflow.yaml
1415
- openshift-templates/inspection-with-cpu-workflow.yaml
1516
- deploymentconfig.yaml

‎amun/base/openshift-templates/inspection-with-cpu-workflow.yaml

+56
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,14 @@ objects:
4141
volumes:
4242
- name: output-volume
4343
emptyDir: {}
44+
- name: workdir
45+
emptyDir: {}
46+
- name: kafka-secrets
47+
secret:
48+
secretName: "kafka"
49+
items:
50+
- key: kafka_ca.crt
51+
path: kafka_ca.crt
4452

4553
arguments:
4654
parameters:
@@ -70,6 +78,11 @@ objects:
7078
value: "${PHYSICAL_CPUS}"
7179
- name: processor
7280
value: "${PROCESSOR}"
81+
# Used for inspection complete messages
82+
- name: send-messages
83+
value: "${THOTH_SEND_MESSAGES}"
84+
- name: force-sync
85+
value: "${THOTH_FORCE_SYNC}"
7386
# Used in artifact repository to store results
7487
- name: ceph_bucket_prefix
7588
- name: ceph_bucket_name
@@ -138,12 +151,55 @@ objects:
138151
continueOn:
139152
failed: true
140153

154+
- name: create-inspection-complete-message
155+
dependencies: [inspection-run]
156+
arguments:
157+
parameters:
158+
- name: inspection-id
159+
value: "{{workflow.parameters.inspection-id}}"
160+
- name: force-sync
161+
value: "{{workflow.parameters.force-sync}}"
162+
templateRef:
163+
name: create-inspection-complete-message
164+
template: create-inspection-complete-message
165+
when: "{{workflow.parameters.send-messages}} == 1"
166+
167+
- name: send-messages
168+
dependencies: [create-inspection-complete-message]
169+
arguments:
170+
artifacts:
171+
- name: messagesdocument
172+
from: "{{tasks.create-inspection-complete-message.outputs.artifacts.messages_to_be_sent_doc}}"
173+
parameters:
174+
- name: THOTH_MESSAGING_FROM_FILE
175+
value: "/mnt/workdir/messages_to_be_sent.json"
176+
- name: THOTH_DEPLOYMENT_NAME
177+
value: "{{workflow.parameters.deployment_name}}"
178+
- name: THOTH_MESSAGING_CREATE_IF_NOT_EXIST
179+
value: "0"
180+
- name: MESSAGES_DOCUMENT_NAME
181+
value: "messages_to_be_sent.json"
182+
templateRef:
183+
name: "send-messages"
184+
template: "send-messages"
185+
186+
141187
parameters:
142188
- name: AMUN_INSPECTION_ID
143189
description: Id of inspection that is run.
144190
displayName: Inspection id
145191
required: true
146192

193+
- name: THOTH_SEND_MESSAGES
194+
description: indicates whether message should be sent upon inspection completion
195+
displayName: send messages
196+
value: "1" # sends message by default
197+
198+
- name: THOTH_FORCE_SYNC
199+
description: should inspection complete message cause graph sync job to be run with force sync
200+
displayName: force sync
201+
value: "0"
202+
147203
- name: AMUN_RUN_CPU
148204
description: CPU cores requested for inspection run
149205
displayName: Run CPU

‎amun/base/openshift-templates/inspection-workflow.yaml

+55
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,14 @@ objects:
4141
volumes:
4242
- name: output-volume
4343
emptyDir: {}
44+
- name: workdir
45+
emptyDir: {}
46+
- name: kafka-secrets
47+
secret:
48+
secretName: "kafka"
49+
items:
50+
- key: kafka_ca.crt
51+
path: kafka_ca.crt
4452

4553
arguments:
4654
parameters:
@@ -62,6 +70,11 @@ objects:
6270
value: "${AMUN_BUILD_CPU}"
6371
- name: build-memory
6472
value: "${AMUN_BUILD_MEMORY}"
73+
# Used for sending messages when inspection completes
74+
- name: send-messages
75+
value: "${THOTH_SEND_MESSAGES}"
76+
- name: force-sync
77+
value: "${THOTH_FORCE_SYNC}"
6578
# Used in artifact repository to store results
6679
- name: ceph_bucket_prefix
6780
- name: ceph_bucket_name
@@ -115,12 +128,54 @@ objects:
115128
continueOn:
116129
failed: true
117130

131+
- name: create-inspection-complete-message
132+
dependencies: [inspection-run]
133+
arguments:
134+
parameters:
135+
- name: inspection-id
136+
value: "{{workflow.parameters.inspection-id}}"
137+
- name: force-sync
138+
value: "{{workflow.parameters.force-sync}}"
139+
templateRef:
140+
name: create-inspection-complete-message
141+
template: create-inspection-complete-message
142+
when: "{{workflow.parameters.send-messages}} == 1"
143+
144+
- name: send-messages
145+
dependencies: [create-inspection-complete-message]
146+
arguments:
147+
artifacts:
148+
- name: messagesdocument
149+
from: "{{tasks.create-inspection-complete-message.outputs.artifacts.messages_to_be_sent_doc}}"
150+
parameters:
151+
- name: THOTH_MESSAGING_FROM_FILE
152+
value: "/mnt/workdir/messages_to_be_sent.json"
153+
- name: THOTH_DEPLOYMENT_NAME
154+
value: "{{workflow.parameters.deployment_name}}"
155+
- name: THOTH_MESSAGING_CREATE_IF_NOT_EXIST
156+
value: "0"
157+
- name: MESSAGES_DOCUMENT_NAME
158+
value: "messages_to_be_sent.json"
159+
templateRef:
160+
name: "send-messages"
161+
template: "send-messages"
162+
118163
parameters:
119164
- name: AMUN_INSPECTION_ID
120165
description: Id of inspection that is run.
121166
displayName: Inspection id
122167
required: true
123168

169+
- name: THOTH_SEND_MESSAGES
170+
description: indicates whether message should be sent upon inspection completion
171+
displayName: send messages
172+
value: "1" # sends message by default
173+
174+
- name: THOTH_FORCE_SYNC
175+
description: should inspection complete message cause graph sync job to be run with force sync
176+
displayName: force sync
177+
value: "0"
178+
124179
- name: AMUN_RUN_CPU
125180
description: CPU cores requested for inspection run
126181
displayName: Run CPU

‎amun/overlays/cnv-prod/amun-api/kustomization.yaml

+19-1
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ apiVersion: kustomize.config.k8s.io/v1beta1
22
kind: Kustomization
33
resources:
44
- ../../../base
5-
- argo-role.yaml
65
- configmaps.yaml
76
- metrics-exporter-reader.yaml
87
- role_binding.yaml
98
- thoth-notification.yaml
9+
- message-imagestream.yaml
1010
patchesStrategicMerge:
1111
- imagestreamtag.yaml
1212
generators:
@@ -32,6 +32,18 @@ patchesJson6902:
3232
version: v1
3333
kind: ImageStream
3434
name: kubectl
35+
- path: put-into-inspection-namespace.yaml
36+
target:
37+
group: image.openshift.io
38+
version: v1
39+
kind: ImageStream
40+
name: workflow-helpers
41+
- path: put-into-inspection-namespace.yaml
42+
target:
43+
group: image.openshift.io
44+
version: v1
45+
kind: ImageStream
46+
name: messaging
3547
- path: put-into-inspection-namespace.yaml
3648
target:
3749
group: image.openshift.io
@@ -74,6 +86,12 @@ patchesJson6902:
7486
version: v1alpha1
7587
kind: WorkflowTemplate
7688
name: inspection-run-template
89+
- path: put-into-inspection-namespace.yaml
90+
target:
91+
group: argoproj.io
92+
version: v1alpha1
93+
kind: WorkflowTemplate
94+
name: send-messages
7795
- path: put-into-inspection-namespace.yaml
7896
target:
7997
group: ""

‎amun/overlays/cnv-prod/amun-api/message-imagestream.yaml

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
---
2+
apiVersion: image.openshift.io/v1
3+
kind: ImageStream
4+
metadata:
5+
name: workflow-helpers
6+
spec:
7+
lookupPolicy:
8+
local: true
9+
tags:
10+
- name: latest
11+
from:
12+
kind: DockerImage
13+
name: quay.io/thoth-station/workflow-helpers:v0.8.1
14+
importPolicy: {}
15+
referencePolicy:
16+
type: Local
17+
---
18+
apiVersion: image.openshift.io/v1
19+
kind: ImageStream
20+
metadata:
21+
name: messaging
22+
spec:
23+
lookupPolicy:
24+
local: true
25+
tags:
26+
- name: latest
27+
from:
28+
kind: DockerImage
29+
name: quay.io/thoth-station/messaging:v0.14.1
30+
importPolicy: {}
31+
referencePolicy:
32+
type: Local

‎amun/overlays/ocp4-stage/amun-api/argo-workflows/send-messages.yaml

-71
This file was deleted.

‎amun/overlays/ocp4-stage/amun-api/kustomization.yaml

-3
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,8 @@ resources:
77
- role_binding.yaml
88
- thoth-notification.yaml
99
- message-imagestream.yaml
10-
- argo-workflows/send-messages.yaml
1110
patchesStrategicMerge:
1211
- imagestreamtag.yaml
13-
- openshift-templates/inspection-workflow.yaml
14-
- openshift-templates/inspection-with-cpu-workflow.yaml
1512
generators:
1613
- ./secret-generator.yaml
1714
patchesJson6902:

‎amun/overlays/ocp4-stage/amun-api/message-imagestream.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ spec:
1010
- name: latest
1111
from:
1212
kind: DockerImage
13-
name: quay.io/thoth-station/workflow-helpers:v0.8.0
13+
name: quay.io/thoth-station/workflow-helpers:v0.8.1
1414
importPolicy: {}
1515
referencePolicy:
1616
type: Local

0 commit comments

Comments
 (0)