Skip to content

Commit 56cf85a

Browse files
committed
Use generated entrypoints, no shell script around the java process
See https://github.com/solsson/dockerfiles/blob/master/hooks/build
1 parent 066477a commit 56cf85a

File tree

4 files changed

+29
-4
lines changed

4 files changed

+29
-4
lines changed

nonroot/entrypoint-from-image.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
- op: remove
2+
path: /spec/template/spec/containers/0/command

nonroot/kustomization.yaml

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,24 @@ patchesJson6902:
2121
kind: StatefulSet
2222
name: zoo
2323
path: fsgroup-65534.yaml
24-
# https://github.com/kubernetes-sigs/kustomize/issues/915#issuecomment-477808963
24+
- target:
25+
group: apps
26+
version: v1
27+
kind: StatefulSet
28+
name: kafka
29+
path: entrypoint-from-image.yaml
30+
- target:
31+
group: apps
32+
version: v1
33+
kind: StatefulSet
34+
name: pzoo
35+
path: entrypoint-from-image.yaml
36+
- target:
37+
group: apps
38+
version: v1
39+
kind: StatefulSet
40+
name: zoo
41+
path: entrypoint-from-image.yaml
2542
patchesStrategicMerge:
2643
- nonroot-image-kafka.yaml
2744
- nonroot-image-zookeeper.yaml

nonroot/nonroot-image-kafka.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,6 @@ spec:
77
spec:
88
containers:
99
- name: broker
10-
image: solsson/kafka:nonroot-2.4.0@sha256:b7dbda9f1941711239fbc3095ea49ba74715a9b2e2e8ce9185106c2e878c06aa
10+
image: solsson/kafka:kafka-server-start-2.4.0@sha256:48a80cb0a5600ef5621a4c2c42ceab2c210e52619100a7bfe62f8bd871c38f2a
11+
args:
12+
- /etc/kafka/server.properties.$(POD_NAME)

nonroot/nonroot-image-zookeeper.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ spec:
77
spec:
88
containers:
99
- name: zookeeper
10-
image: solsson/kafka:nonroot-2.4.0@sha256:b7dbda9f1941711239fbc3095ea49ba74715a9b2e2e8ce9185106c2e878c06aa
10+
image: solsson/kafka:zookeeper-server-start-2.4.0@sha256:6037e1b5c103a638ef3e8fdd4c052527afb5cebbf13b005f5309a71fb2354c4e
11+
args:
12+
- /etc/kafka/zookeeper.properties.$(POD_NAME)
1113
---
1214
apiVersion: apps/v1
1315
kind: StatefulSet
@@ -18,4 +20,6 @@ spec:
1820
spec:
1921
containers:
2022
- name: zookeeper
21-
image: solsson/kafka:nonroot-2.4.0@sha256:b7dbda9f1941711239fbc3095ea49ba74715a9b2e2e8ce9185106c2e878c06aa
23+
image: solsson/kafka:zookeeper-server-start-2.4.0@sha256:6037e1b5c103a638ef3e8fdd4c052527afb5cebbf13b005f5309a71fb2354c4e
24+
args:
25+
- /etc/kafka/zookeeper.properties.$(POD_NAME)

0 commit comments

Comments
 (0)