Skip to content

DEVEXP-403: Mount cluster trusted CA to image registry operator #340

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Aug 20, 2019
Merged

DEVEXP-403: Mount cluster trusted CA to image registry operator #340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions manifests/04-ca-trusted.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
apiVersion: v1
kind: ConfigMap
metadata:
annotations:
release.openshift.io/create-only: "true"
labels:
config.openshift.io/inject-trusted-cabundle: "true"
name: trusted-ca
namespace: openshift-image-registry
14 changes: 14 additions & 0 deletions manifests/07-operator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,9 @@ spec:
value: "cluster-image-registry-operator"
- name: IMAGE
value: docker.io/openshift/origin-docker-registry:latest
volumeMounts:
- name: trusted-ca
mountPath: /etc/pki/ca-trust/extracted/pem/
- name: cluster-image-registry-operator-watch
image: docker.io/openshift/origin-cluster-image-registry-operator:latest
command:
Expand All @@ -81,3 +84,14 @@ spec:
fieldRef:
apiVersion: v1
fieldPath: metadata.namespace
volumeMounts:
- name: trusted-ca
mountPath: /etc/pki/ca-trust/extracted/pem/
volumes:
- name: trusted-ca
configMap:
name: trusted-ca
optional: true
items:
- key: ca-bundle.crt
Copy link
Contributor Author

@adambkaplan adambkaplan Aug 8, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bparees this uses the optional mount and overwrites the filename.

Copy link
Contributor

@bparees bparees Aug 8, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

does "optional" apply to the keys as well as the configmap itself?

Copy link
Contributor Author

@adambkaplan adambkaplan Aug 9, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bparees I can confirm it does. If the key is not present, the pod is still scheduled (and in my testing had lots of unknown CA errors).

path: tls-ca-bundle.pem