Skip to content

Commit 879386d

Browse files
committed
Revert "prevent pod deployment deadlock due to custom SA projected volume injection"
This reverts commit 9bde7bb, openshift#585. It was a temporary workaround in 4.8 to bridge a gap between Kube-API-server and Kube-controller-manager during 4.7 -> 4.8 updates. Once the cluster has reconciled 4.8, we will no longer need the crutch. And 4.8 has now forked off master, so we can revert now, and that revert will go out in 4.9.
1 parent ea6e779 commit 879386d

File tree

1 file changed

+0
-25
lines changed

1 file changed

+0
-25
lines changed

install/0000_00_cluster-version-operator_03_deployment.yaml

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,6 @@ spec:
2020
labels:
2121
k8s-app: cluster-version-operator
2222
spec:
23-
# prevents circular dependency with OpenShift service-ca CM volume injection by
24-
# KAS and creation of the CM by KCM
25-
# TODO: remove in 4.9
26-
automountServiceAccountToken: false
2723
containers:
2824
- name: cluster-version-operator
2925
image: {{.ReleaseImage}}
@@ -52,9 +48,6 @@ spec:
5248
- mountPath: /etc/tls/serving-cert
5349
name: serving-cert
5450
readOnly: true
55-
- mountPath: /var/run/secrets/kubernetes.io/serviceaccount
56-
name: kube-api-access
57-
readOnly: true
5851
env:
5952
- name: KUBERNETES_SERVICE_PORT # allows CVO to communicate with apiserver directly on same host. Is substituted with port from infrastructures.status.apiServerInternalURL if available.
6053
value: "6443"
@@ -102,21 +95,3 @@ spec:
10295
- name: serving-cert
10396
secret:
10497
secretName: cluster-version-operator-serving-cert
105-
- name: kube-api-access
106-
projected:
107-
defaultMode: 420
108-
sources:
109-
- serviceAccountToken:
110-
expirationSeconds: 3600
111-
path: token
112-
- configMap:
113-
items:
114-
- key: ca.crt
115-
path: ca.crt
116-
name: kube-root-ca.crt
117-
- downwardAPI:
118-
items:
119-
- fieldRef:
120-
apiVersion: v1
121-
fieldPath: metadata.namespace
122-
path: namespace

0 commit comments

Comments
 (0)