Skip to content

Commit a388351

Browse files
harshad16harshad16
authored
🐲 build-watcher deployment manifests for amun inspections (#785)
Signed-off-by: Harshad Reddy Nalla <[email protected]>
1 parent bbeda29 commit a388351

9 files changed

+187
-21
lines changed

‎build-watcher/base/deploymentconfig.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -93,22 +93,22 @@ spec:
9393
# provide credentials:
9494
- name: THOTH_SRC_REGISTRY_USER
9595
valueFrom:
96-
configMapKeyRef:
96+
secretKeyRef:
9797
key: thoth-src-registry-user
9898
name: build-watcher
9999
- name: THOTH_SRC_REGISTRY_PASSWORD
100100
valueFrom:
101-
configMapKeyRef:
101+
secretKeyRef:
102102
key: thoth-src-registry-password
103103
name: build-watcher
104104
- name: THOTH_DST_REGISTRY_USER
105105
valueFrom:
106-
configMapKeyRef:
106+
secretKeyRef:
107107
key: thoth-dst-registry-user
108108
name: build-watcher
109109
- name: THOTH_DST_REGISTRY_PASSWORD
110110
valueFrom:
111-
configMapKeyRef:
111+
secretKeyRef:
112112
key: thoth-dst-registry-password
113113
name: build-watcher
114114
- name: THOTH_BUILD_ANALYSIS_NO_BASE_IMAGE

‎build-watcher/base/kustomization.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ resources:
55
- imagestreamtag.yaml
66
- serviceaccount.yaml
77
- role.yaml
8-
- role_binding.yaml
98
- deploymentconfig.yaml
109
commonLabels:
1110
app.kubernetes.io/name: thoth

‎build-watcher/base/role.yaml

+23
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,26 @@ rules:
1818
- get
1919
- list
2020
- watch
21+
- apiGroups:
22+
- ""
23+
- image.openshift.io
24+
resources:
25+
- imagestreamimages
26+
- imagestreammappings
27+
- imagestreams
28+
- imagestreamtags
29+
verbs:
30+
- get
31+
- list
32+
- watch
33+
- apiGroups:
34+
- ""
35+
- build.openshift.io
36+
resources:
37+
- buildconfigs
38+
- builds
39+
- builds/log
40+
verbs:
41+
- get
42+
- list
43+
- watch

‎build-watcher/overlays/amun-api/configmap.yaml

+18-13
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,27 @@ kind: ConfigMap
44
metadata:
55
name: build-watcher
66
data:
7-
thoth-watched-namespace: ""
8-
thoth-environment-type: ""
9-
thoth-push-registry: ""
10-
thoth-user-api-host: ""
11-
thoth-analyze-exising: ""
12-
thoth-src-registry-user: ""
13-
thoth-src-registry-password: ""
14-
thoth-dst-registry-user: ""
15-
thoth-dst-registry-password: ""
16-
thoth-no-tls-verify: "0"
17-
thoth-build-watcher-workers: "1"
7+
build-analysis-no-build-log: "0"
8+
# We do not need to extract packages out of container images. We have
9+
# inspection specification where all the relevant information can be found.
10+
# No need to add these data to the database.
11+
build-analysis-no-base-image: "1"
12+
build-analysis-no-output-image: "1"
13+
kubernetes-verify-tls: "0"
14+
log-build-watcher: "INFO"
15+
logging-no-json: "0"
16+
thoth-watched-namespace: "thoth-amun-inspection-stage"
17+
thoth-environment-type: "runtime"
18+
thoth-user-api-host: "khemenu.thoth-station.ninja"
19+
thoth-push-registry: "quay.io/thoth-station/image-store"
20+
thoth-pass-token: "1"
1821
thoth-no-source-registry-tls-verify: "0"
1922
thoth-no-destination-registry-tls-verify: "0"
20-
thoth-pass-token: "0"
23+
thoth-no-tls-verify: "0"
24+
thoth-analyze-exising: "1"
25+
thoth-build-watcher-workers: "1"
2126
thamos-disable-tls-warning: "0"
22-
thoth-deployment-name: ""
27+
thoth-deployment-name: "ocp4-stage"
2328
sentry-dsn: ""
2429
prometheus-pushgateway-host: "pushgateway-dh-prod-monitoring.cloud.datahub.psi.redhat.com"
2530
prometheus-pushgateway-port: "80"

‎build-watcher/overlays/amun-api/kustomization.yaml

+17
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,14 @@ kind: Kustomization
33
resources:
44
- ../../base
55
- thoth-notification.yaml
6+
- role-binding.yaml
67
patchesStrategicMerge:
78
- configmap.yaml
89
- imagestreamtag.yaml
10+
generatorOptions:
11+
disableNameSuffixHash: true
12+
generators:
13+
- ./secret-generator.yaml
914
patchesJson6902:
1015
- path: job-generate-name.yaml
1116
target:
@@ -19,3 +24,15 @@ patchesJson6902:
1924
version: v1
2025
kind: Job
2126
name: chat-notification-fail-
27+
- path: put-into-inspection-namespace.yaml
28+
target:
29+
group: rbac.authorization.k8s.io
30+
version: v1
31+
kind: Role
32+
name: build-watcher
33+
- path: put-into-inspection-namespace.yaml
34+
target:
35+
group: rbac.authorization.k8s.io
36+
version: v1beta1
37+
kind: RoleBinding
38+
name: build-watcher

‎build-watcher/overlays/amun-api/put-into-inspection-namespace.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
- op: add
2+
path: /metadata/namespace
3+
value: thoth-amun-inspection-stage

‎build-watcher/base/role_binding.yaml ‎build-watcher/overlays/amun-api/role-binding.yaml

+1-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@ roleRef:
77
apiGroup: rbac.authorization.k8s.io
88
kind: Role
99
name: build-watcher
10-
# roleRef:
11-
# kind: ClusterRole
12-
# name: edit
1310
subjects:
1411
- kind: ServiceAccount
1512
name: build-watcher
13+
namespace: thoth-amun-api-stage

‎build-watcher/overlays/amun-api/secret-generator.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
apiVersion: viaduct.ai/v1
2+
kind: ksops
3+
metadata:
4+
name: thoth-secret-generator
5+
files:
6+
- ./secrets.enc.yaml

‎build-watcher/overlays/amun-api/secrets.enc.yaml

+115
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,115 @@
1+
apiVersion: v1
2+
items:
3+
- apiVersion: v1
4+
data:
5+
thoth-src-registry-user: ""
6+
thoth-src-registry-password: ""
7+
thoth-dst-registry-user: ENC[AES256_GCM,data:dh7L0SKKJLNo2Ur0+cZLS1EYwT2V9dSAjh+v,iv:Ba8F+uETL6JJlzqAqHSYII+tvQXOPKDfrFKOB84Zn1s=,tag:TnCBLbAE/P9BH9rKWKI2Yg==,type:str]
8+
thoth-dst-registry-password: ENC[AES256_GCM,data:VYKbxmypQ1amw5sI4U6AVLsPNj99gJ/Y1CIwSz6/GE/YMAxr9Ac3Kjn14kEDAVjbYxpJCYMMRhUVYwL4qOenJw==,iv:/Rys+LhdGjdvmEjf7IkDBS6F/jhZhmwkGY814sow/zA=,tag:Sm7ryLNkkAjaeonrbPSxjA==,type:str]
9+
kind: Secret
10+
metadata:
11+
name: build-watcher
12+
type: Opaque
13+
kind: List
14+
metadata:
15+
resourceVersion: ""
16+
selfLink: ""
17+
sops:
18+
kms: []
19+
gcp_kms: []
20+
azure_kv: []
21+
lastmodified: '2021-01-22T18:58:48Z'
22+
mac: ENC[AES256_GCM,data:hzVfAABdbul0QpcvJO+KD3CsK5N6mwh1eaW/efqMHBSkGSVp85O5KqIXAlg4XGnc42I1sS5Lwc2BviGSUdKPRQzpF8Pyw5HWM5FhcITYtwLHjhlW+42lF1N9w9Qzr1IfXLIIUjDgsHW983c4oP4aP0umBlLQXZWWNIGons2TH7g=,iv:1zlWDEAPJb0/aiEypzKmVfsiSG84+pyDcqO9UoLXAmw=,tag:C4UqUqTHLKu9ofAqaH8Dhg==,type:str]
23+
pgp:
24+
- created_at: '2021-01-22T18:58:47Z'
25+
enc: |
26+
-----BEGIN PGP MESSAGE-----
27+
28+
hQIMA1gbAjViyxWYAQ/+KpqixWQnOBYKVHaIobRnSyDzdd6KHgMnLlmDxHcOlRj4
29+
nSlCTGrtibFzR51wrVANurTmA6wmLNanfS05rQgIKyvBuhshAemVVXrgZ3qgY4/l
30+
q0NZ5ShmANJzte16rk0pXqUj/SL+kVlHtNS/ZRldQ+uz9IA/s3WxDqcIAnYywhXl
31+
AiQ33fXAGu23MyC/IiIXtbazfbyzoG5J45Ptu+9qS4aGGKTvBlnApkz8+/vhUhSr
32+
g6FursAQbeSGRN4f75/83xnqGtXgm+WKREYhPz6urf11gQEsg++G8lyeQW6o7edF
33+
s4KOAAiqFnIFUN3jonNCrVk8G0bvdisj1zGjxlYAZ+vCubgUkJFVkyZQ5f8xpA9n
34+
sxQS6p/7Jcj395sR6AYF+Y2RwE4J/Z0bFwRk/REBto1kzG4liOwDndzScjYA2aBp
35+
8QKvYb7BMa5NNMVrphyWlEnyi3dWH3c7WOeISHoX9rNz5wItndOSFb8hxXv0geQ7
36+
9VWsS+AEQZdTBdhQWAUotFCbaqZcU51kBU1UT8yijX+sBaV3cD/haZsab+bPHnP5
37+
6KKPFtUi5SPahermZBOhvhoyWnSQEDonAzYgC9lr0UdTYMD4AnfyGWaP33r1QUpO
38+
uuY3qXLRQ0yElU5gjWx5Yxi8qjwHCath+7M9jYgIjwAU8wmxL7KesRwWSXOZF5HS
39+
XAEAXinq0joSMl5kTgqAyoXOlEM3toDsnloOw7qDkNDMJT5qMyhKYVlG5BrPE9Rx
40+
32gtpIaOZNmGHqMcWOPg74p958bGQma4zdIM/eN6dxsk1l8D82t9WaCYxzAm
41+
=z5fZ
42+
-----END PGP MESSAGE-----
43+
fp: 34AFE2A7C8E00ED66916D95DA9FBD7DE773B2A34
44+
- created_at: '2021-01-22T18:58:47Z'
45+
enc: |
46+
-----BEGIN PGP MESSAGE-----
47+
48+
hQEMA+/WpawS9RPbAQf/fhuIKOXlT+2oiOnGxXaFo0cBiQehLsWL9LDaPTgpYCJi
49+
/vCfcbzM0LyXbE6sMU+1yKg26fHXcHaXU6OxWLBnoGjFfMIyyKIuSWRdX9Nt0bqU
50+
MJZqeqGKwPElhmDTrB5op15U3vYCRpoZ2RfHdM4hYHlf8CVVrA+cl1qjkt2s36pH
51+
g3hjT4k1mEyynEZ2GPkg3hTCFlKmr9YrurmKC8zyHzlO1SHe2qTHRiDL1We/sRPg
52+
U17C7lItomBtV1kd3UCk0QiMHGmyUqMw9W/NuNUcS3gpN6XdXTGdZgnDlddqGFeV
53+
wl5XkLMi/E0v7nGggLbdwfVndMmmWgX0UFFiI8gVS9JcAUoTgRHdSeU3RWScegjY
54+
XmkcTrSHhMFmaQARyMEoiuXwkezraTu7h2HRY0+xAg2UIO5D31++y0NpgqV4mYls
55+
/4W02aWtDsMKJv5vy+DrEAZYa8PIBkcSpuC3mtA=
56+
=vFgl
57+
-----END PGP MESSAGE-----
58+
fp: 87FC5D0ACF3AA48FCC029086262A80E41BCEEBF7
59+
- created_at: '2021-01-22T18:58:47Z'
60+
enc: |
61+
-----BEGIN PGP MESSAGE-----
62+
63+
hQEMA/irrHa183bxAQf+PAbaRVRlKB6CEy5uc6+6Q110h2+vWdYBn8sO7P4vPc4B
64+
BuH65IdZCtU/Cqg3KbgzKjxCCoBCQWgGLTx6aqyMEOlZS11Rmdd/wsud30XKJw5x
65+
X6lCjkumUFGwD45LiY9xGMOt8kMGmvFupSo+bD1hTrpqVLd5iVhruDyFrSVvMzbd
66+
pMdp3LeUG+InStumPX70tLChsVIguBb6eiR+wWDyGj7ROiip4qRCW0okU3d2Ga6Y
67+
f24PeV9nQAGEEfq3bGWZfU3oCpTqnrNm4BszsW2BLCAtr050pI4mZeynE9miUasc
68+
m01E4L9mxvcOIvxIoyDO5midwFXbbe7kZXJhqllPE9JcAaNJqeNf9S2hfZEIEuhZ
69+
yQsd7K7SkdON0jPyhCNKsDiT8W620ovs0HzKsXKhu2+FvPd+dRyP1WjJuiBtbAb9
70+
jIMXBd3LLDWWRJN7yf6nAuk9vt2vp9ljbwagQNk=
71+
=vaFG
72+
-----END PGP MESSAGE-----
73+
fp: EFDB9AFBD18936D9AB6B2EECBD2C73FF891FBC7E
74+
- created_at: '2021-01-22T18:58:47Z'
75+
enc: |
76+
-----BEGIN PGP MESSAGE-----
77+
78+
hQIMA7vMDF1jUn3mARAAtrOPxnjvvnvafjQpmwzrwswzK2y1EoPbNaoTFj4Fh5rR
79+
Keip1rne4Y8LESKbANrJvigodlqjDl6xtoQsqUpSl8bg0T8+YFH/TENrsDUJ08sJ
80+
j+WDX+1QK+TqmWGAODfdGyssrvzpqr4ubXgb7SLEUHHx7NQ21dQTUf+EoPtOYlVj
81+
/DjV9v4NrtaNqHqw0XTeun+mObFXb5PEd/OT7T3xddtgdsjHjdVd+zj4qN98X/Ci
82+
7MZJEa3AOrQIa+hmY9rbC1geJy7zN3627tELZ6Ch5Wdn2b6wez2pfnrcQORai7U2
83+
FHt7rMQCu7Mbb1QB5RIoh0cw8YGoSUCHfqPQxIBs82vrNam4v/M88NWQuCx4hJAF
84+
YZuATJuZ/RJSXZDDhZbfSev4BKEDRUHsRwYFfVJoZXTLsAETEt2lKLJN/nWbcs0H
85+
dz1NiDqFtioNy5YzepiihBucWMcWp6hwIzkwQwywNWeE3Tcm0Q4slgZCJdFYuj0z
86+
MzOD40dCH/LmQP5XB6z3KIBnymw8uNKszK8Tf/0kKrOyxZX/YP10JgCP4QMBioNG
87+
2GBz3+XGsM4CBvyjhtEoYv6NjloDu+j6cQGCJ/+Otu7/02325+V1KpNM0kwng7J4
88+
P3i3Tx5vs2woqXSonLpxxlelXE2cgq2mzaD92CY0RkKLOXu9DQYfFz+96Q3vgoHS
89+
XAEHatSNKutNc93Y9iepX9R3GVaod7Tx2peuoEH8o88GXzoErJnQur9smENZvJkC
90+
+sgME6Zx0ns0yICMorJkJ35vbYUF56vkEIrNbCsfCWm2eLBFNNjSCi+eHtAf
91+
=d003
92+
-----END PGP MESSAGE-----
93+
fp: 68BD1529A372C8BA561C9DDC377298152D08B95B
94+
- created_at: '2021-01-22T18:58:47Z'
95+
enc: |
96+
-----BEGIN PGP MESSAGE-----
97+
98+
hQIMA9aKBcudqifiAQ//XksKbg5yrAAlC9ZSqDBn9Rnec015MLgGSP4a/IkvGNVx
99+
2K5k2GGWFrL2kOMQsolDNJOlVzJXtkvJhFdiCddJh5Vbrrdu1FZjfnsE70s9IAay
100+
KBmyGufp7P+IEAf82ah7qOSrI1sRypmePCw4iwjY/DdxEA6DqWb6dvDCWClfgSUG
101+
btZsRwbRWNFmnnprlX5JlhpsbQqies3IzSvWN5hvUtQ1blkbe3cm9tYJ++RPR1Iy
102+
lUTJHC7m4ahkpsD/10Cc7OvsFl5EIQEs14dO55Q1ZeO3ur4+KPVhlR7/D5wL4aa7
103+
2RBqIryNmpmXc9gOPilzTxjjZPAa/lrYuu3tZ8fd41OupAZ/N0NzUJ8/ql87RNbL
104+
igDWTjVK+rcYhSD3/AaXtCtMnAHAZf+uwngX7WVds4Kl98Q7SQeyLqQL6LjgcXBs
105+
F4jyB3I3BKfe8wT9taOzljb4ceDHsDdt/KGM3LMOblT+uwZdLa5GNLshGo1fHWtg
106+
Qvc7e3RVV34QU4tgoGWvSQq/yxiHmznNPLMTzFEbKMy9DcRv54Txjr6V5OvVYTR0
107+
UATPJtUoKknx/ukRZnRvBVXlPEBa21ch7+KI/Z4hhe0o2W7XbuHGd142YZ13cOIe
108+
LzolBWcizRe3N9wJ6jlg1cZ+3T12N5PzGR3e4cF0o5fTqC7Pd+94NDZI4//SzZXS
109+
XAEwn3CPyVXV6m11x3+9VLj4Q8Wm7gqI9Q9ihX0/+cCdCmDjy7mxIertEdcloNXU
110+
23IF04U3LnqGv+cyUw88vWZkSzddTD/nDg7ftcsjrXHMRddc82bcQHn1ckpw
111+
=uDCz
112+
-----END PGP MESSAGE-----
113+
fp: 4DC4116D360E3276
114+
encrypted_regex: ^(data|stringData)$
115+
version: 3.5.0

0 commit comments

Comments
 (0)