Fix broken "read only" fields added in v0.11.0.
These fields were changed as a minor hardening attempt when we switched to Distroless, but I bungled the field names and we never noticed because Kapp doesn't apply API validations. This change fixes the field names so they act as was originally intended. We should also follow up with a change that validates all of our installation manifest in CI. Signed-off-by: Matt Moyer <moyerm@vmware.com>
This commit is contained in:
parent
b3b3c2303f
commit
f0a1555aca
@ -116,7 +116,6 @@ spec:
|
|||||||
scheduler.alpha.kubernetes.io/critical-pod: ""
|
scheduler.alpha.kubernetes.io/critical-pod: ""
|
||||||
spec:
|
spec:
|
||||||
securityContext:
|
securityContext:
|
||||||
readOnlyRootFilesystem: true
|
|
||||||
runAsUser: #@ data.values.run_as_user
|
runAsUser: #@ data.values.run_as_user
|
||||||
runAsGroup: #@ data.values.run_as_group
|
runAsGroup: #@ data.values.run_as_group
|
||||||
serviceAccountName: #@ defaultResourceName()
|
serviceAccountName: #@ defaultResourceName()
|
||||||
@ -132,6 +131,8 @@ spec:
|
|||||||
image: #@ data.values.image_repo + ":" + data.values.image_tag
|
image: #@ data.values.image_repo + ":" + data.values.image_tag
|
||||||
#@ end
|
#@ end
|
||||||
imagePullPolicy: IfNotPresent
|
imagePullPolicy: IfNotPresent
|
||||||
|
securityContext:
|
||||||
|
readOnlyRootFilesystem: true
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
cpu: "100m"
|
cpu: "100m"
|
||||||
@ -148,10 +149,13 @@ spec:
|
|||||||
mountPath: /tmp
|
mountPath: /tmp
|
||||||
- name: config-volume
|
- name: config-volume
|
||||||
mountPath: /etc/config
|
mountPath: /etc/config
|
||||||
|
readOnly: true
|
||||||
- name: podinfo
|
- name: podinfo
|
||||||
mountPath: /etc/podinfo
|
mountPath: /etc/podinfo
|
||||||
|
readOnly: true
|
||||||
- name: impersonation-proxy
|
- name: impersonation-proxy
|
||||||
mountPath: /var/run/secrets/impersonation-proxy.concierge.pinniped.dev/serviceaccount
|
mountPath: /var/run/secrets/impersonation-proxy.concierge.pinniped.dev/serviceaccount
|
||||||
|
readOnly: true
|
||||||
env:
|
env:
|
||||||
#@ if data.values.https_proxy:
|
#@ if data.values.https_proxy:
|
||||||
- name: HTTPS_PROXY
|
- name: HTTPS_PROXY
|
||||||
@ -185,7 +189,6 @@ spec:
|
|||||||
medium: Memory
|
medium: Memory
|
||||||
sizeLimit: 100Mi
|
sizeLimit: 100Mi
|
||||||
- name: config-volume
|
- name: config-volume
|
||||||
readOnly: true
|
|
||||||
configMap:
|
configMap:
|
||||||
name: #@ defaultResourceNameWithSuffix("config")
|
name: #@ defaultResourceNameWithSuffix("config")
|
||||||
- name: impersonation-proxy
|
- name: impersonation-proxy
|
||||||
@ -195,7 +198,6 @@ spec:
|
|||||||
- key: token
|
- key: token
|
||||||
path: token
|
path: token
|
||||||
- name: podinfo
|
- name: podinfo
|
||||||
readOnly: true
|
|
||||||
downwardAPI:
|
downwardAPI:
|
||||||
items:
|
items:
|
||||||
- path: "labels"
|
- path: "labels"
|
||||||
|
@ -65,7 +65,6 @@ spec:
|
|||||||
labels: #@ defaultLabel()
|
labels: #@ defaultLabel()
|
||||||
spec:
|
spec:
|
||||||
securityContext:
|
securityContext:
|
||||||
readOnlyRootFilesystem: true
|
|
||||||
runAsUser: #@ data.values.run_as_user
|
runAsUser: #@ data.values.run_as_user
|
||||||
runAsGroup: #@ data.values.run_as_group
|
runAsGroup: #@ data.values.run_as_group
|
||||||
serviceAccountName: #@ defaultResourceName()
|
serviceAccountName: #@ defaultResourceName()
|
||||||
@ -85,6 +84,8 @@ spec:
|
|||||||
- pinniped-supervisor
|
- pinniped-supervisor
|
||||||
- /etc/podinfo
|
- /etc/podinfo
|
||||||
- /etc/config/pinniped.yaml
|
- /etc/config/pinniped.yaml
|
||||||
|
securityContext:
|
||||||
|
readOnlyRootFilesystem: true
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
cpu: "100m"
|
cpu: "100m"
|
||||||
@ -95,8 +96,10 @@ spec:
|
|||||||
volumeMounts:
|
volumeMounts:
|
||||||
- name: config-volume
|
- name: config-volume
|
||||||
mountPath: /etc/config
|
mountPath: /etc/config
|
||||||
|
readOnly: true
|
||||||
- name: podinfo
|
- name: podinfo
|
||||||
mountPath: /etc/podinfo
|
mountPath: /etc/podinfo
|
||||||
|
readOnly: true
|
||||||
ports:
|
ports:
|
||||||
- containerPort: 8080
|
- containerPort: 8080
|
||||||
protocol: TCP
|
protocol: TCP
|
||||||
@ -131,11 +134,9 @@ spec:
|
|||||||
failureThreshold: 3
|
failureThreshold: 3
|
||||||
volumes:
|
volumes:
|
||||||
- name: config-volume
|
- name: config-volume
|
||||||
readOnly: true
|
|
||||||
configMap:
|
configMap:
|
||||||
name: #@ defaultResourceNameWithSuffix("static-config")
|
name: #@ defaultResourceNameWithSuffix("static-config")
|
||||||
- name: podinfo
|
- name: podinfo
|
||||||
readOnly: true
|
|
||||||
downwardAPI:
|
downwardAPI:
|
||||||
items:
|
items:
|
||||||
- path: "labels"
|
- path: "labels"
|
||||||
|
Loading…
Reference in New Issue
Block a user