Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix issue with SELinux and akri #126

Merged
merged 4 commits into from
Apr 25, 2024
Merged
Show file tree
Hide file tree
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
Binary file modified assets/akri/akri-0.12.20.tgz
Binary file not shown.
3 changes: 3 additions & 0 deletions charts/akri/0.12.20/templates/agent.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@ spec:
{{- if .Values.agent.securityContext }}
securityContext:
{{- toYaml .Values.agent.securityContext | nindent 10 }}
{{- else }}
securityContext:
privileged: true
{{- end}}
env:
{{- if .Values.agent.allowDebugEcho }}
Expand Down
4 changes: 1 addition & 3 deletions charts/akri/0.12.20/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,7 @@ agent:
# pullPolicy is the Akri Agent pull policy
pullPolicy: ""
securityContext:
allowPrivilegeEscalation: false
capabilities:
drop: ["ALL"]
privileged: true
host:
# discoveryHandlers is the location of Akri Discovery Handler sockets and
# the agent registration service
Expand Down
4 changes: 2 additions & 2 deletions index.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ entries:
catalog.cattle.io/display-name: Akri
apiVersion: v2
appVersion: 0.12.20
created: "2024-04-24T10:18:46.368590141+02:00"
created: "2024-04-25T15:27:44.833499556+02:00"
description: A Helm chart for Akri
digest: f1f6760018f4171ce14432486105b84cd6389d878cb98ebd36283a7abc2493b7
digest: 268a15da8e39d827d73dfc2bc3c843074ed6209c447636f5847dce8cfde3d7b2
icon: https://raw.githubusercontent.com/project-akri/akri-docs/main/art/icon/akri-icon-light.svg
name: akri
type: application
Expand Down
14 changes: 12 additions & 2 deletions packages/akri/generated-changes/patch/templates/agent.yaml.patch
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,17 @@
{{- if .Values.useDevelopmentContainers }}
{{- if .Values.useLatestContainers }}
image: {{ printf "%s:%s" $repository (default "latest-dev" .Values.agent.image.tag) | quote }}
@@ -68,7 +63,7 @@
@@ -58,6 +53,9 @@
{{- if .Values.agent.securityContext }}
securityContext:
{{- toYaml .Values.agent.securityContext | nindent 10 }}
+ {{- else }}
+ securityContext:
+ privileged: true
{{- end}}
env:
{{- if .Values.agent.allowDebugEcho }}
@@ -68,7 +66,7 @@
value: {{ .Values.debugEcho.configuration.shared | quote }}
{{- end }}
- name: HOST_CRICTL_PATH
Expand All @@ -30,7 +40,7 @@
- name: HOST_RUNTIME_ENDPOINT
value: unix:///host/run/containerd/containerd.sock
- name: HOST_IMAGE_ENDPOINT
@@ -128,4 +123,4 @@
@@ -128,4 +126,4 @@
hostPath:
path: "{{ .Values.agent.host.udev }}"
{{- end }}
Expand Down
23 changes: 17 additions & 6 deletions packages/akri/generated-changes/patch/values.yaml.patch
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,18 @@
# tag is the Akri Agent container tag
# agent.yaml will default to v(AppVersion)[-dev]
# with `-dev` added if `useDevelopmentContainers` is specified
@@ -234,6 +230,8 @@
@@ -98,9 +94,7 @@
# pullPolicy is the Akri Agent pull policy
pullPolicy: ""
securityContext:
- allowPrivilegeEscalation: false
- capabilities:
- drop: ["ALL"]
+ privileged: true
host:
# discoveryHandlers is the location of Akri Discovery Handler sockets and
# the agent registration service
@@ -234,6 +228,8 @@
protocol: TCP
# discovery defines a set of values for a custom discovery handler DaemonSet
discovery:
Expand All @@ -42,7 +53,7 @@
# enabled defines whether discovery handler pods will be deployed in a slim Agent scenario
enabled: false
# name is the Kubernetes resource name that will be created for this
@@ -378,7 +376,7 @@
@@ -378,7 +374,7 @@
enabled: false
image:
# repository is the container reference
Expand All @@ -51,7 +62,7 @@
# tag is the container tag
# debug-echo-configuration.yaml will default to v(AppVersion)[-dev]
# with `-dev` added if `useDevelopmentContainers` is specified
@@ -528,7 +526,7 @@
@@ -528,7 +524,7 @@
enabled: false
image:
# repository is the container reference
Expand All @@ -60,7 +71,7 @@
# tag is the container tag
# onvif-configuration.yaml will default to v(AppVersion)[-dev]
# with `-dev` added if `useDevelopmentContainers` is specified
@@ -671,7 +669,7 @@
@@ -671,7 +667,7 @@
enabled: false
image:
# repository is the container reference
Expand All @@ -69,7 +80,7 @@
# tag is the container tag
# opcua-configuration.yaml will default to v(AppVersion)[-dev]
# with `-dev` added if `useDevelopmentContainers` is specified
@@ -807,7 +805,7 @@
@@ -807,7 +803,7 @@
enabled: false
image:
# repository is the container reference
Expand All @@ -78,7 +89,7 @@
# tag is the container tag
# udev-configuration.yaml will default to v(AppVersion)[-dev]
# with `-dev` added if `useDevelopmentContainers` is specified
@@ -848,7 +846,7 @@
@@ -848,7 +844,7 @@
caBundle: null
image:
# repository is the Akri Webhook for Configurations image reference
Expand Down
Loading