Skip to content

Commit a7d6e43

Browse files
Merge pull request #1208 from dusk125/rofs
OTA-1480: Add readonlyRootFilesystem
2 parents 2628893 + 4e5f950 commit a7d6e43

File tree

4 files changed

+12
-5
lines changed

4 files changed

+12
-5
lines changed

bootstrap/bootstrap-pod.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ spec:
1919
- "--kubeconfig=/etc/kubernetes/kubeconfig"
2020
securityContext:
2121
privileged: true
22+
readOnlyRootFilesystem: true
2223
terminationMessagePolicy: FallbackToLogsOnError
2324
volumeMounts:
2425
- mountPath: /etc/ssl/certs

install/0000_00_cluster-version-operator_03_deployment.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ spec:
4444
cpu: 20m
4545
memory: 50Mi
4646
terminationMessagePolicy: FallbackToLogsOnError
47+
securityContext:
48+
readOnlyRootFilesystem: true
4749
volumeMounts:
4850
- mountPath: /etc/ssl/certs
4951
name: etc-ssl-certs

pkg/cvo/updatepayload.go

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ func (r *payloadRetriever) fetchUpdatePayloadToDir(ctx context.Context, dir stri
208208
}}
209209
container.SecurityContext = &corev1.SecurityContext{
210210
Privileged: ptr.To(true),
211-
ReadOnlyRootFilesystem: ptr.To(false),
211+
ReadOnlyRootFilesystem: ptr.To(true),
212212
}
213213
container.Resources = corev1.ResourceRequirements{
214214
Requests: corev1.ResourceList{
@@ -244,17 +244,19 @@ func (r *payloadRetriever) fetchUpdatePayloadToDir(ctx context.Context, dir stri
244244
Command: []string{"mkdir", tmpDir},
245245
}),
246246
setContainerDefaults(corev1.Container{
247-
Name: "move-operator-manifests-to-temporary-directory",
247+
Name: "copy-operator-manifests-to-temporary-directory",
248248
Command: []string{
249-
"mv",
249+
"cp",
250+
"-r",
250251
filepath.Join(payload.DefaultPayloadDir, payload.CVOManifestDir),
251252
filepath.Join(tmpDir, payload.CVOManifestDir),
252253
},
253254
}),
254255
setContainerDefaults(corev1.Container{
255-
Name: "move-release-manifests-to-temporary-directory",
256+
Name: "copy-release-manifests-to-temporary-directory",
256257
Command: []string{
257-
"mv",
258+
"cp",
259+
"-r",
258260
filepath.Join(payload.DefaultPayloadDir, payload.ReleaseManifestDir),
259261
filepath.Join(tmpDir, payload.ReleaseManifestDir),
260262
},

pkg/payload/testdata/TestRenderManifest_expected_cvo_deployment.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ spec:
4444
cpu: 20m
4545
memory: 50Mi
4646
terminationMessagePolicy: FallbackToLogsOnError
47+
securityContext:
48+
readOnlyRootFilesystem: true
4749
volumeMounts:
4850
- mountPath: /etc/ssl/certs
4951
name: etc-ssl-certs

0 commit comments

Comments
 (0)