Skip to content
Merged
Changes from all commits
Commits
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
Revert "prevent pod deployment deadlock due to custom SA projected vo…
…lume injection"

This reverts commit 9bde7bb, #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.
  • Loading branch information
wking committed Jun 14, 2021
commit 879386d6eada9325265c2430450143727609964d
25 changes: 0 additions & 25 deletions install/0000_00_cluster-version-operator_03_deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,6 @@ spec:
labels:
k8s-app: cluster-version-operator
spec:
# prevents circular dependency with OpenShift service-ca CM volume injection by
# KAS and creation of the CM by KCM
# TODO: remove in 4.9
automountServiceAccountToken: false
containers:
- name: cluster-version-operator
image: {{.ReleaseImage}}
Expand Down Expand Up @@ -52,9 +48,6 @@ spec:
- mountPath: /etc/tls/serving-cert
name: serving-cert
readOnly: true
- mountPath: /var/run/secrets/kubernetes.io/serviceaccount
name: kube-api-access
readOnly: true
env:
- name: KUBERNETES_SERVICE_PORT # allows CVO to communicate with apiserver directly on same host. Is substituted with port from infrastructures.status.apiServerInternalURL if available.
value: "6443"
Expand Down Expand Up @@ -102,21 +95,3 @@ spec:
- name: serving-cert
secret:
secretName: cluster-version-operator-serving-cert
- 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