Skip to content

Commit 1b89401

Browse files
committed
Disable apparmor and seccomp by default
Signed-off-by: Tamal Saha <tamal@appscode.com>
1 parent 6bed1aa commit 1b89401

15 files changed

+1055
-230
lines changed

api/crds/bindata.go

Lines changed: 4 additions & 4 deletions
Large diffs are not rendered by default.

api/crds/installer.stash.appscode.com_stashoperators.v1.yaml

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,6 @@ spec:
3737
description: StashOperatorSpec is the schema for Stash operator values
3838
file
3939
properties:
40-
additionalPodSecurityPolicies:
41-
items:
42-
type: string
43-
type: array
4440
affinity:
4541
description: If specified, the pod's scheduling constraints
4642
properties:
@@ -1201,6 +1197,26 @@ spec:
12011197
replicaCount:
12021198
format: int32
12031199
type: integer
1200+
security:
1201+
properties:
1202+
apparmor:
1203+
properties:
1204+
enabled:
1205+
type: boolean
1206+
type: object
1207+
podSecurityPolicies:
1208+
items:
1209+
type: string
1210+
type: array
1211+
seccomp:
1212+
properties:
1213+
enabled:
1214+
type: boolean
1215+
type: object
1216+
required:
1217+
- apparmor
1218+
- seccomp
1219+
type: object
12041220
serviceAccount:
12051221
properties:
12061222
annotations:
@@ -1262,6 +1278,7 @@ spec:
12621278
- operator
12631279
- pushgateway
12641280
- replicaCount
1281+
- security
12651282
- serviceAccount
12661283
type: object
12671284
type: object

api/crds/installer.stash.appscode.com_stashoperators.yaml

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,6 @@ spec:
4040
spec:
4141
description: StashOperatorSpec is the schema for Stash operator values file
4242
properties:
43-
additionalPodSecurityPolicies:
44-
items:
45-
type: string
46-
type: array
4743
affinity:
4844
description: If specified, the pod's scheduling constraints
4945
properties:
@@ -1172,6 +1168,26 @@ spec:
11721168
replicaCount:
11731169
format: int32
11741170
type: integer
1171+
security:
1172+
properties:
1173+
apparmor:
1174+
properties:
1175+
enabled:
1176+
type: boolean
1177+
type: object
1178+
podSecurityPolicies:
1179+
items:
1180+
type: string
1181+
type: array
1182+
seccomp:
1183+
properties:
1184+
enabled:
1185+
type: boolean
1186+
type: object
1187+
required:
1188+
- apparmor
1189+
- seccomp
1190+
type: object
11751191
serviceAccount:
11761192
properties:
11771193
annotations:
@@ -1233,6 +1249,7 @@ spec:
12331249
- operator
12341250
- pushgateway
12351251
- replicaCount
1252+
- security
12361253
- serviceAccount
12371254
type: object
12381255
type: object

api/openapi-spec/swagger.json

Lines changed: 42 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -866,6 +866,14 @@
866866
}
867867
},
868868
"definitions": {
869+
"dev.appscode.stash.installer.apis.installer.v1alpha1.ApparmorSpec": {
870+
"type": "object",
871+
"properties": {
872+
"enabled": {
873+
"type": "boolean"
874+
}
875+
}
876+
},
869877
"dev.appscode.stash.installer.apis.installer.v1alpha1.Container": {
870878
"type": "object",
871879
"required": [
@@ -961,6 +969,35 @@
961969
}
962970
}
963971
},
972+
"dev.appscode.stash.installer.apis.installer.v1alpha1.SeccompSpec": {
973+
"type": "object",
974+
"properties": {
975+
"enabled": {
976+
"type": "boolean"
977+
}
978+
}
979+
},
980+
"dev.appscode.stash.installer.apis.installer.v1alpha1.SecuritySpec": {
981+
"type": "object",
982+
"required": [
983+
"apparmor",
984+
"seccomp"
985+
],
986+
"properties": {
987+
"apparmor": {
988+
"$ref": "#/definitions/dev.appscode.stash.installer.apis.installer.v1alpha1.ApparmorSpec"
989+
},
990+
"podSecurityPolicies": {
991+
"type": "array",
992+
"items": {
993+
"type": "string"
994+
}
995+
},
996+
"seccomp": {
997+
"$ref": "#/definitions/dev.appscode.stash.installer.apis.installer.v1alpha1.SeccompSpec"
998+
}
999+
}
1000+
},
9641001
"dev.appscode.stash.installer.apis.installer.v1alpha1.ServiceAccountSpec": {
9651002
"type": "object",
9661003
"required": [
@@ -1080,15 +1117,10 @@
10801117
"imagePullPolicy",
10811118
"serviceAccount",
10821119
"apiserver",
1083-
"monitoring"
1120+
"monitoring",
1121+
"security"
10841122
],
10851123
"properties": {
1086-
"additionalPodSecurityPolicies": {
1087-
"type": "array",
1088-
"items": {
1089-
"type": "string"
1090-
}
1091-
},
10921124
"affinity": {
10931125
"description": "If specified, the pod's scheduling constraints",
10941126
"$ref": "#/definitions/io.k8s.api.core.v1.Affinity"
@@ -1162,6 +1194,9 @@
11621194
"type": "integer",
11631195
"format": "int32"
11641196
},
1197+
"security": {
1198+
"$ref": "#/definitions/dev.appscode.stash.installer.apis.installer.v1alpha1.SecuritySpec"
1199+
},
11651200
"serviceAccount": {
11661201
"$ref": "#/definitions/dev.appscode.stash.installer.apis.installer.v1alpha1.ServiceAccountSpec"
11671202
},

0 commit comments

Comments
 (0)