-
Notifications
You must be signed in to change notification settings - Fork 35
OPRUN-3554: UPSTREAM: <carry>: Add hostPath mount for /var/lib/kubelet
#152
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.
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
OPRUN-3554: UPSTREAM: <carry>: Add hostPath mount for /var/lib/kubelet
#152
Conversation
@anik120: This pull request references OPRUN-3554 which is a valid jira issue. Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.18.0" version, but no target version was set. In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository. |
6ce7490
to
a13a452
Compare
/test verify-commits I'm not sure why this target is failing? The logs say that the pod failed to come up, that doesn't sound like I did anything wrong? 🤷🏽♂️ |
Need to add |
openshift/generate-manifests.sh
Outdated
|
||
# Override OPENSHIFT-NAMESPACE to ${NAMESPACE} | ||
find "${TMP_ROOT}" -name "*.yaml" -exec sed -i "s/OPENSHIFT-NAMESPACE/${NAMESPACE}/g" {} \; | ||
find "${TMP_ROOT}" -name "*.yaml" -exec "$SED_CMD" -i "s/OPENSHIFT-NAMESPACE/${NAMESPACE}/g" {} \; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
find "${TMP_ROOT}" -name "*.yaml" -exec "$SED_CMD" -i "s/OPENSHIFT-NAMESPACE/${NAMESPACE}/g" {} \; | |
find "${TMP_ROOT}" -name "*.yaml" -exec sed -i.tmp "s/OPENSHIFT-NAMESPACE/${NAMESPACE}/g" {} \; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Because blank arguments are a bit weird, I went the safe route and just specified the backup file for everything. I checked, and this works on macOS and Fedora. Since the files are in ${TMP_ROOT}
having a backup is ok, and will be cleaned up when ${TMP_ROOT}
is deleted.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Aha. TIL. Updated.
...fests/18-deployment-openshift-operator-controller-operator-controller-controller-manager.yml
Outdated
Show resolved
Hide resolved
...fests/18-deployment-openshift-operator-controller-operator-controller-controller-manager.yml
Outdated
Show resolved
Hide resolved
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The macOS compatibility fix is a lot easier than presented.
@@ -0,0 +1,6 @@ | |||
- op: add | |||
path: /spec/template/spec/volumes/- | |||
value: {"name":"auth-from-host", "hostPath":{"path":"/var/lib/kubelet", "type": "Directory"}} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
value: {"name":"auth-from-host", "hostPath":{"path":"/var/lib/kubelet", "type": "Directory"}} | |
value: {"name":"global-auth-file", "hostPath":{"path":"/var/lib/kubelet/config.json", "type": "File"}} |
value: {"name":"auth-from-host", "hostPath":{"path":"/var/lib/kubelet", "type": "Directory"}} | ||
- op: add | ||
path: /spec/template/spec/containers/0/volumeMounts/- | ||
value: {"name":"auth-from-host", "readOnly": true, "mountPath":"/etc/operator-controller"} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
value: {"name":"auth-from-host", "readOnly": true, "mountPath":"/etc/operator-controller"} | |
value: {"name":"global-auth-file", "readOnly": true, "mountPath":"/etc/operator-controller/auth.json"} |
a13a452
to
045f690
Compare
/var/lib/kubelet
/var/lib/kubelet
c02bfae
to
e65a2cc
Compare
MCO makes the global pull secrets available in `/var/lib/kubelet`. Operator-controller will look for these secrets in `/etc/operator-controller` folder, ref [operator-controller:1303](operator-framework/operator-controller#1303). This PR hostPath mounts the `/var/lib/kublet` directory from the host to the `/etc/operator-controller` directory in the container's filesystem. RFC: [OLMv1 Private registry support](https://docs.google.com/document/d/1BXD6kj5zXHcGiqvJOikU2xs8kV26TPnzEKp6n7TKD4M/edit?usp=sharing) Signed-off-by: Anik Bhattacharjee <anbhatta@redhat.com>
e65a2cc
to
0208648
Compare
/var/lib/kubelet
/var/lib/kubelet
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/approve
/lgtm
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: anik120, everettraven The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
@anik120: all tests passed! Full PR test history. Your PR dashboard. Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here. |
[ART PR BUILD NOTIFIER] Distgit: ose-olm-operator-controller |
MCO makes the global pull secrets available in
/var/lib/kubelet
. Operator-controller will look for these secrets in/etc/operator-controller
folder, ref operator-controller:1303.This PR hostPath mounts the
/var/lib/kublet
directory from the host to the/etc/operator-controller
directory in the container's filesystem.RFC: OLMv1 Private registry support