Skip to content

Commit 4ab73a0

Browse files
committed
Adapts to the new entrypoint strategy, and distroless native zookeper
1 parent 728acff commit 4ab73a0

File tree

4 files changed

+27
-5
lines changed

4 files changed

+27
-5
lines changed

native/distroless.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# The more specific removes are to make sure that there was a shell that we're removing
2+
- op: remove
3+
path: /spec/template/spec/containers/0/readinessProbe/exec
4+
- op: remove
5+
path: /spec/template/spec/containers/0/readinessProbe
6+
- op: remove
7+
path: /spec/template/spec/containers/0/lifecycle/preStop/exec
8+
- op: remove
9+
path: /spec/template/spec/containers/0/lifecycle/preStop

native/kustomization.yaml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,16 @@ bases:
22
- ../nonroot
33
patchesStrategicMerge:
44
- native-image-zookeeper.yaml
5+
patchesJson6902:
6+
- target:
7+
group: apps
8+
version: v1
9+
kind: StatefulSet
10+
name: pzoo
11+
path: distroless.yaml
12+
- target:
13+
group: apps
14+
version: v1
15+
kind: StatefulSet
16+
name: zoo
17+
path: distroless.yaml

nonroot/kustomization.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ bases:
22
- ../rbac-namespace-default
33
- ../kafka
44
- ../zookeeper
5+
patchesStrategicMerge:
6+
- nonroot-image-kafka.yaml
7+
- nonroot-image-zookeeper.yaml
58
patchesJson6902:
69
- target:
710
group: apps
@@ -39,6 +42,3 @@ patchesJson6902:
3942
kind: StatefulSet
4043
name: zoo
4144
path: entrypoint-from-image.yaml
42-
patchesStrategicMerge:
43-
- nonroot-image-kafka.yaml
44-
- nonroot-image-zookeeper.yaml
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
[
2-
{"op": "add", "path": "/spec/template/spec/containers/0/args/2", "value": "--override"},
3-
{"op": "add", "path": "/spec/template/spec/containers/0/args/3", "value": "advertised.listeners=PLAINTEXT://:9092,OUTSIDE://localhost:9094"}
2+
{"op": "add", "path": "/spec/template/spec/containers/0/args/1", "value": "--override"},
3+
{"op": "add", "path": "/spec/template/spec/containers/0/args/2", "value": "advertised.listeners=PLAINTEXT://:9092,OUTSIDE://localhost:9094"}
44
]

0 commit comments

Comments
 (0)