Skip to content

Commit c8f5763

Browse files
committed
criocp controller
Signed-off-by: Qi Wang <qiwan@redhat.com>
1 parent 7eb4793 commit c8f5763

13 files changed

Lines changed: 1182 additions & 35 deletions

File tree

install/0000_80_machine-config_00_rbac.yaml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,38 @@ subjects:
144144
roleRef:
145145
kind: Role
146146
name: host-networking-services
147+
148+
---
149+
apiVersion: rbac.authorization.k8s.io/v1
150+
kind: ClusterRole
151+
metadata:
152+
name: node-credential-providers
153+
annotations:
154+
include.release.openshift.io/self-managed-high-availability: "true"
155+
include.release.openshift.io/single-node-developer: "true"
156+
rules:
157+
- apiGroups: [""]
158+
resources: ["serviceaccounts"]
159+
verbs: ["get", "list"]
160+
- apiGroups: [""]
161+
resources: ["*"]
162+
verbs: ["request-serviceaccounts-token-audience"]
163+
---
164+
apiVersion: rbac.authorization.k8s.io/v1
165+
kind: ClusterRoleBinding
166+
metadata:
167+
name: node-credential-providers-binding
168+
annotations:
169+
include.release.openshift.io/self-managed-high-availability: "true"
170+
include.release.openshift.io/single-node-developer: "true"
171+
roleRef:
172+
apiGroup: rbac.authorization.k8s.io
173+
kind: ClusterRole
174+
name: node-credential-providers
175+
subjects:
176+
- kind: Group
177+
apiGroup: rbac.authorization.k8s.io
178+
name: system:nodes
147179
---
148180
apiVersion: rbac.authorization.k8s.io/v1
149181
kind: RoleBinding

manifests/machineconfigcontroller/clusterrole.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ rules:
1313
resources: ["configmaps", "secrets"]
1414
verbs: ["*"]
1515
- apiGroups: ["config.openshift.io"]
16-
resources: ["images", "clusterversions", "featuregates", "nodes", "nodes/status", "imagepolicies/status"]
16+
resources: ["images", "clusterversions", "featuregates", "nodes", "nodes/status", "imagepolicies/status", "criocredentialproviderconfigs/status"]
1717
verbs: ["*"]
1818
- apiGroups: ["config.openshift.io"]
19-
resources: ["schedulers", "apiservers", "infrastructures", "imagedigestmirrorsets", "imagetagmirrorsets", "clusterimagepolicies", "imagepolicies"]
19+
resources: ["schedulers", "apiservers", "infrastructures", "imagedigestmirrorsets", "imagetagmirrorsets", "clusterimagepolicies", "imagepolicies", "criocredentialproviderconfigs"]
2020
verbs: ["get", "list", "watch"]
2121
- apiGroups: ["operator.openshift.io"]
2222
resources: ["imagecontentsourcepolicies"]

pkg/apihelpers/apihelpers.go

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,32 @@ var (
108108
},
109109
},
110110
},
111+
// Add default policy for KubernetesCredentialProvidersDir
112+
{
113+
Path: constants.KubernetesCredentialProvidersDir,
114+
Actions: []opv1.NodeDisruptionPolicyStatusAction{
115+
{
116+
Type: opv1.RestartStatusAction,
117+
Restart: &opv1.RestartService{
118+
ServiceName: "kubelet.service",
119+
},
120+
},
121+
},
122+
},
123+
{
124+
Path: constants.KubeletCrioImageCredProviderConfPath,
125+
Actions: []opv1.NodeDisruptionPolicyStatusAction{
126+
{
127+
Type: opv1.DaemonReloadStatusAction,
128+
},
129+
{
130+
Type: opv1.RestartStatusAction,
131+
Restart: &opv1.RestartService{
132+
ServiceName: "kubelet.service",
133+
},
134+
},
135+
},
136+
},
111137
},
112138
SSHKey: opv1.NodeDisruptionPolicyStatusSSHKey{
113139
Actions: []opv1.NodeDisruptionPolicyStatusAction{

0 commit comments

Comments
 (0)