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.

Sign up for GitHub

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

dev to kube-1.14 #2368

Merged
merged 11 commits into from
Jul 30, 2019
Merged

dev to kube-1.14 #2368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
cee8195
Bind Emergency and Manual Groups same as PowerUser
mikkeloscar Jul 26, 2019
015400f
Update webhook to block escalate
mikkeloscar Jul 26, 2019
da2753f
UX: additionalPrinterColumns for PlatformCredentialsSet
hjacobs Jul 29, 2019
0b7e646
remove interrupts metrics which creates a bloat of unusable metrics
szuecs Jul 29, 2019
c817dfb
Merge pull request #2366 from zalando-incubator/fix/node-exporter-crash
aermakov-zalando Jul 29, 2019
0320e40
Merge dev to dev-to-kube-1.14
zalando-teapot-robot Jul 29, 2019
36e0b5d
Merge pull request #2358 from zalando-incubator/manual-emergency-rbac
mikkeloscar Jul 29, 2019
16d2620
Merge dev to dev-to-kube-1.14
zalando-teapot-robot Jul 29, 2019
bbc33f9
use processingStatus instead of errors/problems list
hjacobs Jul 29, 2019
6326e5a
Merge pull request #2365 from zalando-incubator/platformcredentialsse…
hjacobs Jul 29, 2019
e47bd9d
Merge dev to dev-to-kube-1.14
zalando-teapot-robot Jul 29, 2019
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
13 changes: 13 additions & 0 deletions cluster/manifests/01-platformcredentialsset/customresourcedefinition.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,19 @@ spec:
- pcs
categories:
- all
additionalPrinterColumns:
- JSONPath: .spec.application
description: ID of application registered in application registry
name: Application
type: string
- JSONPath: .status.processingStatus
description: Processing status reported by Credentials Provider
name: Status
type: string
- JSONPath: .metadata.creationTimestamp
description: Age of the PlatformCredentialsSet
name: Age
type: date
validation:
openAPIV3Schema:
required:
Expand Down
1 change: 0 additions & 1 deletion cluster/manifests/prometheus-node-exporter/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ spec:
- image: registry.opensource.zalan.do/teapot/prometheus-node-exporter:v0.18.1
args:
- --collector.textfile.directory=/prometheus-exporter-data
- --collector.interrupts
- --collector.processes
name: prometheus-node-exporter
ports:
Expand Down
6 changes: 6 additions & 0 deletions cluster/manifests/roles/poweruser-binding.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,9 @@ subjects:
- kind: Group
name: PowerUser
apiGroup: rbac.authorization.k8s.io
- kind: Group
name: Manual
apiGroup: rbac.authorization.k8s.io
- kind: Group
name: Emergency
apiGroup: rbac.authorization.k8s.io
2 changes: 1 addition & 1 deletion cluster/node-pools/master-default/userdata.clc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -489,7 +489,7 @@ storage:
- mountPath: /etc/kubernetes/ssl
name: ssl-certs-kubernetes
readOnly: true
- image: registry.opensource.zalan.do/teapot/k8s-authnz-webhook:v0.5.6
- image: registry.opensource.zalan.do/teapot/k8s-authnz-webhook:v0.5.7
name: webhook
ports:
- containerPort: 8081
Expand Down
2 changes: 1 addition & 1 deletion cluster/node-pools/master-ubuntu-default/userdata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ write_files:
- mountPath: /etc/kubernetes/ssl
name: ssl-certs-kubernetes
readOnly: true
- image: registry.opensource.zalan.do/teapot/k8s-authnz-webhook:v0.5.6
- image: registry.opensource.zalan.do/teapot/k8s-authnz-webhook:v0.5.7
name: webhook
ports:
- containerPort: 8081
Expand Down
28 changes: 28 additions & 0 deletions test/e2e/authorisation_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2156,6 +2156,34 @@ var _ = framework.KubeDescribe("Authorization tests", func() {
}}`,
},
},
{
msg: "cdp service account can't escalate permissions",
reqBody: `{
"apiVersion": "authorization.k8s.io/v1beta1",
"kind": "SubjectAccessReview",
"spec": {
"resourceAttributes": {
"namespace": "",
"verb": "escalate",
"group": "*",
"resource": "clusterroles"
},
"user": "system:serviceaccount:default:cdp",
"group": []
}
}`,
expect: expect{
status: http.StatusCreated,
body: `{
"apiVersion": "authorization.k8s.io/v1beta1",
"kind": "SubjectAccessReview",
"status": {
"denied": true,
"reason": "no one is allowed to escalate"
}
}}`,
},
},
{
msg: "operator service account cannot create namespaces",
reqBody: `{
Expand Down