Skip to content

Bug 1946479: pkg/operator/staticpod/controller/installer,pruner: use manual SA mounts #1100

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
Jun 8, 2021
Merged

Bug 1946479: pkg/operator/staticpod/controller/installer,pruner: use manual SA mounts #1100

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
22 changes: 22 additions & 0 deletions pkg/operator/staticpod/controller/installer/bindata/bindata.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 22 additions & 0 deletions pkg/operator/staticpod/controller/installer/manifests/installer-pod.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ metadata:
labels:
app: installer
spec:
automountServiceAccountToken: false
serviceAccountName: installer-sa
nodeName: # Value set by operator
containers:
Expand All @@ -30,6 +31,9 @@ spec:
volumeMounts:
- mountPath: /etc/kubernetes/
name: kubelet-dir
- mountPath: /var/run/secrets/kubernetes.io/serviceaccount
name: kube-api-access
readOnly: true
resources:
requests:
memory: 200M
Expand All @@ -47,3 +51,21 @@ spec:
- hostPath:
path: /etc/kubernetes/
name: kubelet-dir
- name: kube-api-access
projected:
defaultMode: 420
sources:
- serviceAccountToken:
expirationSeconds: 3600
path: token
- configMap:
items:
- key: ca.crt
path: ca.crt
name: kube-root-ca.crt
- downwardAPI:
items:
- fieldRef:
apiVersion: v1
fieldPath: metadata.namespace
path: namespace
22 changes: 22 additions & 0 deletions pkg/operator/staticpod/controller/prune/bindata/bindata.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 22 additions & 0 deletions pkg/operator/staticpod/controller/prune/manifests/pruner-pod.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ metadata:
labels:
app: pruner
spec:
automountServiceAccountToken: false
serviceAccountName: installer-sa
nodeName: # Value set by operator
containers:
Expand All @@ -28,6 +29,9 @@ spec:
volumeMounts:
- mountPath: /etc/kubernetes/
name: kubelet-dir
- mountPath: /var/run/secrets/kubernetes.io/serviceaccount
name: kube-api-access
readOnly: true
restartPolicy: Never
priorityClassName: system-node-critical
tolerations:
Expand All @@ -38,3 +42,21 @@ spec:
- hostPath:
path: /etc/kubernetes/
name: kubelet-dir
- name: kube-api-access
projected:
defaultMode: 420
sources:
- serviceAccountToken:
expirationSeconds: 3600
path: token
- configMap:
items:
- key: ca.crt
path: ca.crt
name: kube-root-ca.crt
- downwardAPI:
items:
- fieldRef:
apiVersion: v1
fieldPath: metadata.namespace
path: namespace