Skip to content

Commit 0ad826c

Browse files
authored
Trust custom CA bundle for outgoing caching connections (#9427)
* Fix namespace for squid component Signed-off-by: Alex Misstear <[email protected]> * Trust custom CA bundle for outgoing caching connections Signed-off-by: Alex Misstear <[email protected]> --------- Signed-off-by: Alex Misstear <[email protected]>
1 parent ab1c025 commit 0ad826c

File tree

5 files changed

+35
-1
lines changed

5 files changed

+35
-1
lines changed

argo-cd-apps/base/member/infra-deployments/squid/squid.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ spec:
3030
repoURL: https://github.com/redhat-appstudio/infra-deployments.git
3131
targetRevision: main
3232
destination:
33-
namespace: proxy
33+
namespace: caching
3434
server: '{{server}}'
3535
syncPolicy:
3636
automated:

components/squid/base/kustomization.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ kind: Kustomization
33

44
resources:
55
- rbac.yaml
6+
- trusted-ca-configmap.yaml
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
apiVersion: v1
3+
kind: ConfigMap
4+
metadata:
5+
name: trusted-ca
6+
labels:
7+
config.openshift.io/inject-trusted-cabundle: "true"

components/squid/development/squid-helm-generator.yaml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,3 +44,16 @@ valuesInline:
4444
- ^https://quayio-production-s3\.s3[a-z0-9.-]*\.amazonaws\.com/sha256/.+/[a-f0-9]{64}
4545
size: 192
4646
maxObjectSize: 128
47+
tlsOutgoingOptions:
48+
caFile: /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem
49+
volumes:
50+
- name: trusted-ca
51+
configMap:
52+
name: trusted-ca
53+
items:
54+
- key: ca-bundle.crt
55+
path: tls-ca-bundle.pem
56+
volumeMounts:
57+
- name: trusted-ca
58+
mountPath: /etc/pki/ca-trust/extracted/pem
59+
readOnly: true

components/squid/staging/squid-helm-generator.yaml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,3 +44,16 @@ valuesInline:
4444
- ^https://quayio-production-s3\.s3[a-z0-9.-]*\.amazonaws\.com/sha256/.+/[a-f0-9]{64}
4545
size: 1536
4646
maxObjectSize: 256
47+
tlsOutgoingOptions:
48+
caFile: /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem
49+
volumes:
50+
- name: trusted-ca
51+
configMap:
52+
name: trusted-ca
53+
items:
54+
- key: ca-bundle.crt
55+
path: tls-ca-bundle.pem
56+
volumeMounts:
57+
- name: trusted-ca
58+
mountPath: /etc/pki/ca-trust/extracted/pem
59+
readOnly: true

0 commit comments

Comments
 (0)