Skip to content
This repository was archived by the owner on Mar 22, 2018. It is now read-only.

Commit 839e3bb

Browse files
committed
update Dockerfile and pod for k8s-keystone-auth
1 parent 410e6e2 commit 839e3bb

2 files changed

Lines changed: 32 additions & 36 deletions

File tree

cluster/images/webhook/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ RUN apk add --no-cache ca-certificates
1717
ADD k8s-keystone-auth /bin/
1818

1919
EXPOSE 8443
20-
CMD ./bin/k8s-keystone-auth --tls-cert-file ${API_SERVER_CERT} --tls-private-key-file ${API_SERVER_KEY} --keystone-url ${OPENSTACK_KEYSTONE_URL}
2120

21+
CMD ["/bin/k8s-keystone-auth"]
Lines changed: 31 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,51 @@
1-
---
21
apiVersion: v1
32
kind: Pod
43
metadata:
54
annotations:
65
scheduler.alpha.kubernetes.io/critical-pod: ""
7-
creationTimestamp: null
86
labels:
9-
component: k8s-keystone-auth
7+
component: kube-controller-manager
108
tier: control-plane
119
name: k8s-keystone-auth
1210
namespace: kube-system
1311
spec:
1412
containers:
15-
- command:
16-
- ./bin/k8s-keystone-auth
17-
- --tls-cert-file
18-
- /etc/kubernetes/pki/apiserver.crt
19-
- --tls-private-key-file
20-
- /etc/kubernetes/pki/apiserver.key
21-
- --keystone-url
22-
- https://mykeystone.com:5000/v3
23-
image: k8s-keystone-auth
24-
imagePullPolicy: Always
25-
#livenessProbe:
26-
# failureThreshold: 8
27-
# httpGet:
28-
# host: 127.0.0.1
29-
# path: /healthz
30-
# port: 6443
31-
# scheme: HTTPS
32-
# initialDelaySeconds: 15
33-
# timeoutSeconds: 15
34-
name: k8s-keystone-auth
35-
resources:
36-
requests:
37-
cpu: 250m
38-
volumeMounts:
39-
- mountPath: /etc/kubernetes/pki
40-
name: k8s-certs
41-
readOnly: true
42-
- mountPath: /etc/ssl/certs
43-
name: ca-certs
44-
readOnly: true
13+
- name: k8s-keystone-auth
14+
image: dims/k8s-keystone-auth:0.1.0
15+
args:
16+
- /bin/k8s-keystone-auth
17+
- --v=10
18+
- --tls-cert-file
19+
- /etc/kubernetes/pki/apiserver.crt
20+
- --tls-private-key-file
21+
- /etc/kubernetes/pki/apiserver.key
22+
- --keystone-policy-file
23+
- /etc/kubernetes/webhook/policy.json
24+
- --keystone-url=http://ctl:5000/v3
25+
volumeMounts:
26+
- mountPath: /etc/kubernetes/pki
27+
name: k8s-certs
28+
readOnly: true
29+
- mountPath: /etc/kubernetes/webhook
30+
name: k8s-webhook
31+
readOnly: true
32+
- mountPath: /etc/ssl/certs
33+
name: ca-certs
34+
readOnly: true
35+
resources:
36+
requests:
37+
cpu: 200m
4538
hostNetwork: true
4639
volumes:
4740
- hostPath:
4841
path: /etc/kubernetes/pki
4942
type: DirectoryOrCreate
5043
name: k8s-certs
44+
- hostPath:
45+
path: /etc/kubernetes/webhook
46+
type: DirectoryOrCreate
47+
name: k8s-webhook
5148
- hostPath:
5249
path: /etc/ssl/certs
5350
type: DirectoryOrCreate
54-
name: ca-certs
55-
status: {}
51+
name: ca-certs

0 commit comments

Comments
 (0)