Adapts to the new entrypoint+command strategy, and distroless native …

…zookeper
Yolean · May 18, 2020 · 53326d9 · 53326d9
1 parent 728acff
commit 53326d9
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 5 deletions.
diff --git a/native/distroless.yaml b/native/distroless.yaml
@@ -0,0 +1,8 @@
+- op: remove
+  path: /spec/template/spec/containers/0/readinessProbe/exec
+- op: remove
+  path: /spec/template/spec/containers/0/readinessProbe
+- op: remove
+  path: /spec/template/spec/containers/0/lifecycle/preStop/exec
+- op: remove
+  path: /spec/template/spec/containers/0/lifecycle/preStop
diff --git a/native/kustomization.yaml b/native/kustomization.yaml
@@ -2,3 +2,16 @@ bases:
 - ../nonroot
 patchesStrategicMerge:
 - native-image-zookeeper.yaml
+patchesJson6902:
+- target:
+    group: apps
+    version: v1
+    kind: StatefulSet
+    name: pzoo
+  path: distroless.yaml
+- target:
+    group: apps
+    version: v1
+    kind: StatefulSet
+    name: zoo
+  path: distroless.yaml
diff --git a/nonroot/kustomization.yaml b/nonroot/kustomization.yaml
@@ -2,6 +2,9 @@ bases:
 - ../rbac-namespace-default
 - ../kafka
 - ../zookeeper
+patchesStrategicMerge:
+- nonroot-image-kafka.yaml
+- nonroot-image-zookeeper.yaml
 patchesJson6902:
 - target:
     group: apps
@@ -39,6 +42,3 @@ patchesJson6902:
     kind: StatefulSet
     name: zoo
   path: entrypoint-from-image.yaml
-patchesStrategicMerge:
-- nonroot-image-kafka.yaml
-- nonroot-image-zookeeper.yaml
diff --git a/variants/dev-small/listener-localhost.json b/variants/dev-small/listener-localhost.json
@@ -1,4 +1,4 @@
 [
-  {"op": "add", "path": "/spec/template/spec/containers/0/args/2", "value": "--override"},
-  {"op": "add", "path": "/spec/template/spec/containers/0/args/3", "value": "advertised.listeners=PLAINTEXT://:9092,OUTSIDE://localhost:9094"}
+  {"op": "add", "path": "/spec/template/spec/containers/0/args/1", "value": "--override"},
+  {"op": "add", "path": "/spec/template/spec/containers/0/args/2", "value": "advertised.listeners=PLAINTEXT://:9092,OUTSIDE://localhost:9094"}
 ]