Skip to content

Commit 10369e0

Browse files
AndrienkoAleksandrMo3m3n
authored andcommitted
Revert tls patches for Minio
Revert tls patchesto fix connection tekton-result api and Minio S3 Fix: init container for bucket creation should fail when can not connect to Minio server. Signed-off-by: Oleksandr Andriienko <[email protected]>
1 parent 09ca47c commit 10369e0

File tree

4 files changed

+32
-4
lines changed

4 files changed

+32
-4
lines changed

developer/openshift/gitops/argocd/pipeline-service/kustomization.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ resources:
77

88
patchesStrategicMerge:
99
- tekton-results/minio-create-bucket.yaml
10+
- tekton-results/minio-tls.yaml
1011

1112
# Skip applying the Tekton operands while the Tekton operator is being installed.
1213
# See more information about this option, here:

developer/openshift/gitops/argocd/pipeline-service/tekton-results/kustomization.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ resources:
66

77
patchesStrategicMerge:
88
- minio-create-bucket.yaml
9+
- minio-tls.yaml

developer/openshift/gitops/argocd/pipeline-service/tekton-results/minio-create-bucket.yaml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ spec:
1818
args:
1919
- '-c'
2020
- |
21-
mc --config-dir /tmp config host add minio "$S3_ENDPOINT" "$S3_ACCESS_KEY_ID" "$S3_SECRET_ACCESS_KEY";
22-
if [ -z "$(mc --config-dir /tmp ls minio | grep tekton-results)" ]; then
23-
mc --config-dir /tmp mb --with-lock --region "$S3_REGION" minio/"$S3_BUCKET_NAME";
24-
echo "Minio bucket $S3_BUCKET_NAME successfully created.";
21+
mc --config-dir /tmp config host add minio "$S3_ENDPOINT" "$S3_ACCESS_KEY_ID" "$S3_SECRET_ACCESS_KEY" &&
22+
if [ -z "$(mc --config-dir /tmp ls minio | grep "$S3_BUCKET_NAME")" ]; then
23+
mc --config-dir /tmp mb --with-lock --region "$S3_REGION" minio/"$S3_BUCKET_NAME" &&
24+
echo "Minio bucket $S3_BUCKET_NAME successfully created."
2525
fi
2626
imagePullPolicy: Always
2727
env:
@@ -50,3 +50,7 @@ spec:
5050
secretKeyRef:
5151
key: endpoint
5252
name: tekton-results-s3
53+
volumeMounts:
54+
- name: ca-s3
55+
mountPath: /etc/ssl/certs/s3-cert.crt
56+
subPath: s3-cert.crt
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
---
2+
apiVersion: apps/v1
3+
kind: Deployment
4+
metadata:
5+
name: tekton-results-api
6+
namespace: tekton-results
7+
spec:
8+
template:
9+
spec:
10+
volumes:
11+
- name: ca-s3
12+
secret:
13+
secretName: storage-tls
14+
items:
15+
- key: public.crt
16+
path: s3-cert.crt
17+
containers:
18+
- name: api
19+
volumeMounts:
20+
- name: ca-s3
21+
mountPath: /etc/ssl/certs/s3-cert.crt
22+
subPath: s3-cert.crt

0 commit comments

Comments
 (0)