Skip to content

Commit 8721c8d

Browse files
committed
ci: Update Tekton config ...
to not pull container images from Docker Hub. Signed-off-by: Paulo Vital <paulo.vital@ibm.com>
1 parent 657b42a commit 8721c8d

File tree

7 files changed

+95
-85
lines changed

7 files changed

+95
-85
lines changed

.tekton/.currency/currency-scheduled-eventlistener.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ spec:
4848
spec:
4949
containers:
5050
- name: http-request-to-el-svc
51-
# curlimages/curl:8.6.0
52-
image: curlimages/curl@sha256:f2237028bed58de91f62aea74260bb2a299cf12fbcabc23cfaf125fef276c884
51+
# quay.io/curl/curl:8.11.0
52+
image: quay.io/curl/curl@sha256:b90c4281fe1a4c6cc2b6a665c531d448bba078d75ffa98187e7d7e530fca5209
5353
imagePullPolicy: IfNotPresent
5454
args: ["curl", "-X", "POST", "--data", "{}", "el-python-currency-cron-listener.default.svc.cluster.local:8080"]
5555
restartPolicy: OnFailure

.tekton/.currency/currency-tasks.yaml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,12 @@ spec:
1111
mountPath: /workspace
1212
steps:
1313
- name: clone-repo
14-
# alpine/git:2.43.0
15-
image: alpine/git@sha256:6ff4de047dcc8f0c7d75d2efff63fbc189e87d2f458305f2cc8f165ff83309cf
14+
# public.ecr.aws/docker/library/alpine:3.20.3
15+
image: public.ecr.aws/docker/library/alpine@sha256:029a752048e32e843bd6defe3841186fb8d19a28dae8ec287f433bb9d6d1ad85
1616
script: |
1717
#!/bin/sh
18+
echo "Installing git"
19+
apk fix && apk --no-cache --update add git gpg less openssh patch
1820
echo "Cloning repo"
1921
cd /workspace && git clone --filter=blob:none --sparse --depth 1 https://github.com/instana/python-sensor -b $(params.revision)
2022
cd python-sensor
@@ -31,8 +33,8 @@ spec:
3133
mountPath: /workspace
3234
steps:
3335
- name: generate-currency-report
34-
# 3.10.15-bookworm
35-
image: python@sha256:b346d9d55e40cd6079db55370581b3bd24067acf5f1acc386107ec0843102ec9
36+
# public.ecr.aws/docker/library/python:3.10.15-bookworm
37+
image: public.ecr.aws/docker/library/python@sha256:2eb72484c25c39aba019b0ab5679c2436833a0b705e955ed8e13c06ee900dd63
3638
script: |
3739
#!/usr/bin/env bash
3840
cd /workspace/python-sensor/.tekton/.currency
@@ -61,8 +63,8 @@ spec:
6163
mountPath: /workspace
6264
steps:
6365
- name: upload-currency-report
64-
# alpine/git:2.43.0
65-
image: alpine/git@sha256:6ff4de047dcc8f0c7d75d2efff63fbc189e87d2f458305f2cc8f165ff83309cf
66+
# public.ecr.aws/docker/library/alpine:3.20.3
67+
image: public.ecr.aws/docker/library/alpine@sha256:029a752048e32e843bd6defe3841186fb8d19a28dae8ec287f433bb9d6d1ad85
6668
env:
6769
- name: GH_ENTERPRISE_TOKEN
6870
valueFrom:
@@ -71,7 +73,10 @@ spec:
7173
key: "GH_ENTERPRISE_TOKEN"
7274
script: |
7375
#!/bin/sh
76+
echo "Installing git"
77+
apk fix && apk --no-cache --update add git gpg less openssh patch
7478
79+
echo "Cloning repo"
7580
cd /workspace
7681
git clone https://oauth2:$GH_ENTERPRISE_TOKEN@github.ibm.com/instana/tracer-reports.git
7782

.tekton/github-set-status-task.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ spec:
1414
secretName: githubtoken
1515
steps:
1616
- name: set-status
17-
# curlimages/curl:8.6.0
18-
image: curlimages/curl@sha256:f2237028bed58de91f62aea74260bb2a299cf12fbcabc23cfaf125fef276c884
17+
# quay.io/curl/curl:8.11.0
18+
image: quay.io/curl/curl@sha256:b90c4281fe1a4c6cc2b6a665c531d448bba078d75ffa98187e7d7e530fca5209
1919
env:
2020
- name: SHA
2121
value: $(params.SHA)

.tekton/pipeline.yaml

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -19,24 +19,25 @@ spec:
1919
- name: task-pvc
2020
workspace: python-tracer-ci-pipeline-pvc
2121
- name: unittest-default
22+
displayName: "Platforms and Browsers: $(params.platform) and $(params.browser)"
2223
runAfter:
2324
- clone
2425
matrix:
2526
params:
2627
- name: imageDigest
2728
value:
28-
# 3.8.20-bookworm
29-
- "sha256:f53fd710218c3c5415229037afaf04d0f32acba87dd90d48863fbdab4227ac89"
30-
# 3.9.20-bookworm
31-
- "sha256:dbb0be5b67aa84b9e3e4f325c7844ab439f40a5cca717c5b24e671cfb41dbb46"
32-
# 3.10.15-bookworm
33-
- "sha256:b346d9d55e40cd6079db55370581b3bd24067acf5f1acc386107ec0843102ec9"
34-
# 3.11.10-bookworm
35-
- "sha256:3cd9b520be95c671135ea1318f32be6912876024ee16d0f472669d3878801651"
36-
# 3.12.6-bookworm
37-
- "sha256:af6fa5c329d6bd6dec52855ccb8bb37c30fb8f00819953a035d49499e43b2c9b"
38-
# 3.13.0-bookworm
39-
- "sha256:feee4734fdc44cc09a3c9cdb72e05bb8ff7e964f64766bc1a68638b2c667cf35"
29+
# public.ecr.aws/docker/library/python:3.8.20-bookworm
30+
- "sha256:7aa279fb41dad2962d3c915aa6f6615134baa412ab5aafa9d4384dcaaa0af15d"
31+
# public.ecr.aws/docker/library/python:3.9.20-bookworm
32+
- "sha256:54b70fa5a9a48299b6c8b47e3c1a0b969271f9769810f1ab17547f1fecdd72cc"
33+
# public.ecr.aws/docker/library/python:3.10.15-bookworm
34+
- "sha256:2eb72484c25c39aba019b0ab5679c2436833a0b705e955ed8e13c06ee900dd63"
35+
# public.ecr.aws/docker/library/python:3.11.10-bookworm
36+
- "sha256:15f10b142547000e2429615b3d314474ae7d6ac062a8dd2c9246adcee7068e55"
37+
# public.ecr.aws/docker/library/python:3.12.7-bookworm
38+
- "sha256:4429a1580a1db32addb5127499a88a8bc6eecb08c7ea19a77b5b69c32f840acd"
39+
# public.ecr.aws/docker/library/python:3.13.0-bookworm
40+
- "sha256:ecd27b6c43d8d84b0058e7db4aaa06a1bfe970d0fb9bb7cf39f9536850f71510"
4041
taskRef:
4142
name: python-tracer-unittest-default-task
4243
workspaces:
@@ -49,8 +50,8 @@ spec:
4950
params:
5051
- name: imageDigest
5152
value:
52-
# 3.9.20-bookworm
53-
- "sha256:dbb0be5b67aa84b9e3e4f325c7844ab439f40a5cca717c5b24e671cfb41dbb46"
53+
# public.ecr.aws/docker/library/python:3.9.20-bookworm
54+
- "sha256:54b70fa5a9a48299b6c8b47e3c1a0b969271f9769810f1ab17547f1fecdd72cc"
5455
taskRef:
5556
name: python-tracer-unittest-cassandra-task
5657
workspaces:
@@ -63,8 +64,8 @@ spec:
6364
params:
6465
- name: imageDigest
6566
value:
66-
# 3.9.20-bookworm
67-
- "sha256:dbb0be5b67aa84b9e3e4f325c7844ab439f40a5cca717c5b24e671cfb41dbb46"
67+
# public.ecr.aws/docker/library/python:3.9.20-bookworm
68+
- "sha256:54b70fa5a9a48299b6c8b47e3c1a0b969271f9769810f1ab17547f1fecdd72cc"
6869
taskRef:
6970
name: python-tracer-unittest-gevent-starlette-task
7071
workspaces:
@@ -77,8 +78,8 @@ spec:
7778
params:
7879
- name: imageDigest
7980
value:
80-
# 3.12.6-bookworm
81-
- "sha256:af6fa5c329d6bd6dec52855ccb8bb37c30fb8f00819953a035d49499e43b2c9b"
81+
# public.ecr.aws/docker/library/python:3.12.7-bookworm
82+
- "sha256:4429a1580a1db32addb5127499a88a8bc6eecb08c7ea19a77b5b69c32f840acd"
8283
taskRef:
8384
name: python-tracer-unittest-aws-task
8485
workspaces:

.tekton/python-tracer-prepuller.yaml

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -14,60 +14,60 @@ spec:
1414
# Configure an init container for each image you want to pull
1515
initContainers:
1616
- name: prepuller-git
17-
# alpine/git:2.43.0
18-
image: alpine/git@sha256:6ff4de047dcc8f0c7d75d2efff63fbc189e87d2f458305f2cc8f165ff83309cf
17+
# public.ecr.aws/docker/library/alpine:3.20.3
18+
image: public.ecr.aws/docker/library/alpine@sha256:029a752048e32e843bd6defe3841186fb8d19a28dae8ec287f433bb9d6d1ad85
1919
command: ["sh", "-c", "'true'"]
2020
- name: prepuller-google-cloud-pubsub
21-
# vanmoof/pubsub-emulator:latest
22-
image: vanmoof/pubsub-emulator@sha256:ff71206d65589b58a8b6928c35349a58dbfd7f20eb2dc7822e0f32e5c40791c8
21+
# quay.io/thekevjames/gcloud-pubsub-emulator:501.0.0
22+
image: quay.io/thekevjames/gcloud-pubsub-emulator@sha256:9bad1f28e6a3d6cd5f462c654c736faa4cf49732d9422ddb427ad30f3037c0ff
2323
command: ["sh", "-c", "'true'"]
2424
- name: prepuller-cassandra
25-
# cassandra:3.11.16-jammy
26-
image: cassandra@sha256:7d32a79e9adb4ca8c26f798e4a44ec8438da99c6bda2969410ea46cbdb0b4b94
25+
# public.ecr.aws/docker/library/cassandra:3.11.16-jammy
26+
image: public.ecr.aws/docker/library/cassandra@sha256:b175d99b80f8108594d00c705288fdb3186b9fc07b30b4c292c3592cddb5f0b5
2727
command: ["sh", "-c", "'true'"]
2828
- name: prepuller-rabbitmq
29-
# rabbitmq:3.13.0
30-
image: rabbitmq@sha256:27819d7be883b8aea04b9a244460181ef97427a98f8323b39402d65e6eb2ce6f
29+
# public.ecr.aws/docker/library/rabbitmq:3.13.0
30+
image: public.ecr.aws/docker/library/rabbitmq@sha256:39de1a4fc6c72d12bd5dfa23e8576536fd1c0cc8418344cd5a51addfc9a1145d
3131
command: ["sh", "-c", "'true'"]
3232
- name: prepuller-redis
33-
# redis:7.2.4-bookworm
34-
image: redis@sha256:fe98b2d39d462d06a7360e2860dd6ceff930745e3731eccb3c1406dd0dd7f744
33+
# public.ecr.aws/docker/library/redis:7.2.4-bookworm
34+
image: public.ecr.aws/docker/library/redis@sha256:9341b6548cc35b64a6de0085555264336e2f570e17ecff20190bf62222f2bd64
3535
command: ["sh", "-c", "'true'"]
3636
- name: prepuller-mongo
37-
# mongo:7.0.6
38-
image: mongo@sha256:125bda8abe859bcebc47e4a7e0921508d3bcb47725d261f0a2bcf4ea5c837dd5
37+
# public.ecr.aws/docker/library/mongo:7.0.6
38+
image: public.ecr.aws/docker/library/mongo@sha256:3a023748ee30e915dd51642f1ef430c73c4e54937060054ca84c70417f510cc5
3939
command: ["sh", "-c", "'true'"]
4040
- name: prepuller-mariadb
41-
# mariadb:11.3.2
42-
image: mariadb@sha256:851f05fe1e4cb290442c1b12b7108436a33fd8f6a733d4989950322d06d45c65
41+
# public.ecr.aws/docker/library/mariadb:11.3.2
42+
image: public.ecr.aws/docker/library/mariadb@sha256:a4a81ab6d190db84b67f286fd0511cdea619a24b63790b3db4fb69d263a5cd37
4343
command: ["sh", "-c", "'true'"]
4444
- name: prepuller-postgres
45-
# postgres:16.2-bookworm
46-
image: postgres@sha256:3bfb87432e26badf72d727a0c5f5bb7b81438cd9baec5be8531c70a42b07adc6
45+
# public.ecr.aws/docker/library/postgres:16.2-bookworm
46+
image: public.ecr.aws/docker/library/postgres@sha256:07572430dbcd821f9f978899c3ab3a727f5029be9298a41662e1b5404d5b73e0
4747
command: ["sh", "-c", "'true'"]
4848
- name: prepuller-38
49-
# 3.8.20-bookworm
50-
image: "python@sha256:f53fd710218c3c5415229037afaf04d0f32acba87dd90d48863fbdab4227ac89"
49+
# public.ecr.aws/docker/library/python:3.8.20-bookworm
50+
image: public.ecr.aws/docker/library/python@
5151
command: ["sh", "-c", "'true'"]
5252
- name: prepuller-39
53-
# 3.9.20-bookworm
54-
image: "python@sha256:dbb0be5b67aa84b9e3e4f325c7844ab439f40a5cca717c5b24e671cfb41dbb46"
53+
# public.ecr.aws/docker/library/python:3.9.20-bookworm
54+
image: public.ecr.aws/docker/library/python@sha256:54b70fa5a9a48299b6c8b47e3c1a0b969271f9769810f1ab17547f1fecdd72cc
5555
command: ["sh", "-c", "'true'"]
5656
- name: prepuller-310
57-
# 3.10.15-bookworm
58-
image: "python@sha256:b346d9d55e40cd6079db55370581b3bd24067acf5f1acc386107ec0843102ec9"
57+
# public.ecr.aws/docker/library/python:3.10.15-bookworm
58+
image: public.ecr.aws/docker/library/python@sha256:2eb72484c25c39aba019b0ab5679c2436833a0b705e955ed8e13c06ee900dd63
5959
command: ["sh", "-c", "'true'"]
6060
- name: prepuller-311
61-
# 3.11.10-bookworm
62-
image: "python@sha256:3cd9b520be95c671135ea1318f32be6912876024ee16d0f472669d3878801651"
61+
# public.ecr.aws/docker/library/python:3.11.10-bookworm
62+
image: public.ecr.aws/docker/library/python@sha256:15f10b142547000e2429615b3d314474ae7d6ac062a8dd2c9246adcee7068e55
6363
command: ["sh", "-c", "'true'"]
6464
- name: prepuller-312
65-
# 3.12.6-bookworm
66-
image: "python@sha256:af6fa5c329d6bd6dec52855ccb8bb37c30fb8f00819953a035d49499e43b2c9b"
65+
# public.ecr.aws/docker/library/python:3.12.7-bookworm
66+
image: public.ecr.aws/docker/library/python@sha256:4429a1580a1db32addb5127499a88a8bc6eecb08c7ea19a77b5b69c32f840acd
6767
command: ["sh", "-c", "'true'"]
6868
- name: prepuller-313
69-
# 3.13.0rc2-bookworm
70-
image: "python@sha256:3aed70fd4585395e47c6005f0082b966151561f3c4070a3ed9d2fb594bbf44b8"
69+
# public.ecr.aws/docker/library/python:3.13.0
70+
image: public.ecr.aws/docker/library/python@sha256:ecd27b6c43d8d84b0058e7db4aaa06a1bfe970d0fb9bb7cf39f9536850f71510
7171
command: ["sh", "-c", "'true'"]
7272

7373
# Use the pause container to ensure the Pod goes into a `Running` phase

.tekton/scheduled-eventlistener.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,12 @@ spec:
6161
spec:
6262
containers:
6363
- name: git
64-
# alpine/git:2.43.0
65-
image: alpine/git@sha256:6ff4de047dcc8f0c7d75d2efff63fbc189e87d2f458305f2cc8f165ff83309cf
66-
command:
67-
- sh
68-
- -c
69-
- |
64+
# public.ecr.aws/docker/library/alpine:3.20.3
65+
image: public.ecr.aws/docker/library/alpine@sha256:029a752048e32e843bd6defe3841186fb8d19a28dae8ec287f433bb9d6d1ad85
66+
script: |
67+
#!/bin/sh
68+
echo "Installing git"
69+
apk fix && apk --no-cache --update add git gpg less openssh patch
7070
wget -O- \
7171
--header 'Content-Type: application/json' \
7272
--post-data '{

.tekton/task.yaml

Lines changed: 27 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,12 @@ spec:
1212
mountPath: /workspace
1313
steps:
1414
- name: clone
15-
# alpine/git:2.43.0
16-
image: alpine/git@sha256:6ff4de047dcc8f0c7d75d2efff63fbc189e87d2f458305f2cc8f165ff83309cf
15+
# public.ecr.aws/docker/library/alpine:3.20.3
16+
image: public.ecr.aws/docker/library/alpine@sha256:029a752048e32e843bd6defe3841186fb8d19a28dae8ec287f433bb9d6d1ad85
1717
script: |
1818
#!/bin/sh
19+
echo "Installing git"
20+
apk fix && apk --no-cache --update add git gpg less openssh patch
1921
echo "Cloning repo"
2022
cd /workspace && git clone --depth 1 -b $(params.revision) https://github.com/instana/python-sensor
2123
ls -lah /workspace
@@ -27,8 +29,8 @@ metadata:
2729
spec:
2830
sidecars:
2931
- name: cassandra
30-
# cassandra:3.11.16-jammy
31-
image: cassandra@sha256:7d32a79e9adb4ca8c26f798e4a44ec8438da99c6bda2969410ea46cbdb0b4b94
32+
# public.ecr.aws/docker/library/cassandra:3.11.16-jammy
33+
image: public.ecr.aws/docker/library/cassandra@sha256:b175d99b80f8108594d00c705288fdb3186b9fc07b30b4c292c3592cddb5f0b5
3234
env:
3335
- name: MAX_HEAP_SIZE
3436
value: 2048m
@@ -49,7 +51,7 @@ spec:
4951
mountPath: /workspace
5052
steps:
5153
- name: unittest
52-
image: python@$(params.imageDigest)
54+
image: public.ecr.aws/docker/library/python@$(params.imageDigest)
5355
env:
5456
- name: TEST_CONFIGURATION
5557
value: cassandra
@@ -70,7 +72,7 @@ spec:
7072
mountPath: /workspace
7173
steps:
7274
- name: unittest
73-
image: python@$(params.imageDigest)
75+
image: public.ecr.aws/docker/library/python@$(params.imageDigest)
7476
env:
7577
- name: TEST_CONFIGURATION
7678
value: gevent_starlette
@@ -85,28 +87,30 @@ metadata:
8587
spec:
8688
sidecars:
8789
- name: google-cloud-pubsub
88-
# vanmoof/pubsub-emulator:latest
89-
image: vanmoof/pubsub-emulator@sha256:ff71206d65589b58a8b6928c35349a58dbfd7f20eb2dc7822e0f32e5c40791c8
90+
# quay.io/thekevjames/gcloud-pubsub-emulator
91+
image: quay.io/thekevjames/gcloud-pubsub-emulator@sha256:9bad1f28e6a3d6cd5f462c654c736faa4cf49732d9422ddb427ad30f3037c0ff
9092
env:
9193
- name: PUBSUB_EMULATOR_HOST
92-
value: 0.0.0.0:8085
94+
value: 0.0.0.0:8681
95+
- name: PUBSUB_PROJECT1
96+
value: test-project,test-topic
9397
ports:
94-
- containerPort: 8085
95-
hostPort: 8085
98+
- containerPort: 8681
99+
hostPort: 8681
96100
- name: mariadb
97-
# mariadb:11.3.2
98-
image: mariadb@sha256:851f05fe1e4cb290442c1b12b7108436a33fd8f6a733d4989950322d06d45c65
101+
# public.ecr.aws/docker/library/mariadb:11.3.2
102+
image: public.ecr.aws/docker/library/mariadb@sha256:a4a81ab6d190db84b67f286fd0511cdea619a24b63790b3db4fb69d263a5cd37
99103
env:
100104
- name: MYSQL_ROOT_PASSWORD # or MARIADB_ROOT_PASSWORD
101105
value: passw0rd
102106
- name: MYSQL_DATABASE # or MARIADB_DATABASE
103107
value: instana_test_db
104108
- name: mongo
105-
# mongo:7.0.6
106-
image: mongo@sha256:125bda8abe859bcebc47e4a7e0921508d3bcb47725d261f0a2bcf4ea5c837dd5
109+
# public.ecr.aws/docker/library/mongo:7.0.6
110+
image: public.ecr.aws/docker/library/mongo@sha256:3a023748ee30e915dd51642f1ef430c73c4e54937060054ca84c70417f510cc5
107111
- name: postgres
108-
# postgres:16.2-bookworm
109-
image: postgres@sha256:3bfb87432e26badf72d727a0c5f5bb7b81438cd9baec5be8531c70a42b07adc6
112+
# public.ecr.aws/docker/library/postgres:16.2-bookworm
113+
image: public.ecr.aws/docker/library/postgres@sha256:07572430dbcd821f9f978899c3ab3a727f5029be9298a41662e1b5404d5b73e0
110114
env:
111115
- name: POSTGRES_USER
112116
value: root
@@ -122,11 +126,11 @@ spec:
122126
- pg_isready --host 127.0.0.1 --port 5432 --dbname=${POSTGRES_DB}
123127
timeoutSeconds: 10
124128
- name: redis
125-
# redis:7.2.4-bookworm
126-
image: redis@sha256:fe98b2d39d462d06a7360e2860dd6ceff930745e3731eccb3c1406dd0dd7f744
129+
# public.ecr.aws/docker/library/redis:7.2.4-bookworm
130+
image: public.ecr.aws/docker/library/redis@sha256:9341b6548cc35b64a6de0085555264336e2f570e17ecff20190bf62222f2bd64
127131
- name: rabbitmq
128-
# rabbitmq:3.13.0
129-
image: rabbitmq@sha256:27819d7be883b8aea04b9a244460181ef97427a98f8323b39402d65e6eb2ce6f
132+
# public.ecr.aws/docker/library/rabbitmq:3.13.0
133+
image: public.ecr.aws/docker/library/rabbitmq@sha256:39de1a4fc6c72d12bd5dfa23e8576536fd1c0cc8418344cd5a51addfc9a1145d
130134
params:
131135
- name: imageDigest
132136
type: string
@@ -135,7 +139,7 @@ spec:
135139
mountPath: /workspace
136140
steps:
137141
- name: unittest
138-
image: python@$(params.imageDigest)
142+
image: public.ecr.aws/docker/library/python@$(params.imageDigest)
139143
env:
140144
- name: TEST_CONFIGURATION
141145
value: default
@@ -156,7 +160,7 @@ spec:
156160
mountPath: /workspace
157161
steps:
158162
- name: unittest
159-
image: python@$(params.imageDigest)
163+
image: public.ecr.aws/docker/library/python@$(params.imageDigest)
160164
env:
161165
- name: TEST_CONFIGURATION
162166
value: aws

0 commit comments

Comments
 (0)