Replace Alpine by minideb as base image (vmware-archive#585)

Signed-off-by: Sameer Naik <[email protected]> (cherry picked from commit 435a449)
jameswwirth · Jul 3, 2019 · 6d97930 · 6d97930
1 parent 0b100be
commit 6d97930
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/docs/migration-guides/prometheus-migration.md b/docs/migration-guides/prometheus-migration.md
@@ -81,12 +81,12 @@ local rsync_container_name = "sidecar-rsync";
 
 // sidecar-rsync container (mounting <volume_name>) to be exposed via rsync
 local rsync_container = kube.Container(rsync_container_name) {
-  image: "alpine:3.8",
+  image: "bitnami/minideb:stretch",
   args: [
     "sh",
     "-c",
     |||
-      apk update && apk add rsync
+      install_packages rsync
       echo '%s' | base64 -d > /rsync.conf
       rsync -vvv --daemon --no-detach --config=/rsync.conf
     ||| % [rsync_conf_b64],
@@ -187,8 +187,8 @@ local kube = import "kube.libsonnet";
             spec+: {
               containers_+: {
                 rsync: kube.Container("sidecar-rsync") {
-                  image: "alpine:3.8",
-                  args+: ["sh", "-c", "apk update && apk add rsync curl && tail -f /dev/null"],
+                  image: "bitnami/minideb:stretch",
+                  args+: ["sh", "-c", "install_packages rsync curl && tail -f /dev/null"],
                   volumeMounts_+: {
                     data: { mountPath: "/data" },
                   },
@@ -214,7 +214,7 @@ After deploying them, the Prometheus pod will have 3 containers:
 ```console
 $ kubectl get pods -o=jsonpath='{range .items[*]}{"\n"}{.metadata.name}{":\t"}{range .spec.containers[*]}{.image}{", "}{end}{end}' | grep prometheus |\
 sort
-prometheus-0: bitnami/prometheus:2.4.3-r31, jimmidyson/configmap-reload:v0.2.2, alpine:3.8,
+prometheus-0: bitnami/prometheus:2.4.3-r31, jimmidyson/configmap-reload:v0.2.2, bitnami/minideb:stretch,
 ```
 
 ## Step 3: Sync with the compaction times of the Prometheus TSDB

diff --git a/manifests/components/elasticsearch.jsonnet b/manifests/components/elasticsearch.jsonnet
@@ -183,10 +183,10 @@ local ELASTICSEARCH_TRANSPORT_PORT = 9300;
           },
           initContainers_+: {
             elasticsearch_logging_init: kube.Container("elasticsearch-logging-init") {
-              image: "alpine:3.6",
+              image: "bitnami/minideb:stretch",
               // TODO: investigate feasibility of switching to https://kubernetes.io/docs/tasks/administer-cluster/sysctl-cluster/#setting-sysctls-for-a-pod
               // NOTE: copied verbatim from https://www.elastic.co/guide/en/elasticsearch/reference/5.6/vm-max-map-count.html
-              command: ["/sbin/sysctl", "-w", "vm.max_map_count=262144"],
+              command: ["sh", "-c", "install_packages procps && sysctl -w vm.max_map_count=262144"],
               securityContext: {
                 privileged: true,
               },