Add postgres (rdb) arg logcollector=off. (#2)

This makes init.sh script redundant and it has been removed.
ChrisEke · Feb 10, 2021 · d643575 · d643575
1 parent 70c9eac
commit d643575
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 302 deletions.
diff --git a/lib/talkyard/files/init.sh b/lib/talkyard/files/init.sh
diff --git a/lib/talkyard/talkyard.libsonnet b/lib/talkyard/talkyard.libsonnet
@@ -60,6 +60,7 @@
                       + container.withEnv([
                         container.envType.fromSecretRef('POSTGRES_PASSWORD', 'talkyard-rdb-secrets', 'postgres-password'),
                       ])
+                      + container.withArgs('--logging_collector=off')
                       + container.mixin.readinessProbe.exec.withCommand($._probe.rdb.readiness.execCommand)
                       + container.mixin.readinessProbe.withInitialDelaySeconds(10)
                       + container.mixin.readinessProbe.withTimeoutSeconds(6)
@@ -70,13 +71,8 @@
                       + container.mixin.livenessProbe.withTimeoutSeconds(6),
                     ],
                   )
-                  + deployment.mixin.metadata.withLabels(commonLabels + c.rdb.labels)
-                  + $.util.configMapVolumeMount(self.initShOverrideConfigMap, '/docker-entrypoint-initdb.d'),
+                  + deployment.mixin.metadata.withLabels(commonLabels + c.rdb.labels),
       service: $.util.serviceFor(self.deployment),
-      initShOverrideConfigMap: configMap.new(c.rdb.name + '-init-sh-override')
-                               + configMap.withData({
-                                 'init.sh': importstr 'files/init.sh',
-                               }),
     },
     cache: {
       deployment: deployment.new(

diff --git a/manifests/kustomization.yaml b/manifests/kustomization.yaml
@@ -7,7 +7,6 @@ resources:
 - cache-Deployment.yaml
 - cache-Service.yaml
 - rdb-Deployment.yaml
-- rdb-init-sh-override-ConfigMap.yaml
 - rdb-Service.yaml
 - search-Deployment.yaml
 - search-environment-vars-ConfigMap.yaml

diff --git a/manifests/rdb-Deployment.yaml b/manifests/rdb-Deployment.yaml
@@ -16,13 +16,13 @@ spec:
       name: rdb
   template:
     metadata:
-      annotations:
-        rdb-init-sh-override-hash: 7c3cde4a1adfa2344a4bbab371fafcce
       labels:
         name: rdb
     spec:
       containers:
-      - env:
+      - args:
+        - --logging_collector=off
+        env:
         - name: POSTGRES_PASSWORD
           valueFrom:
             secretKeyRef:
@@ -52,10 +52,3 @@ spec:
           initialDelaySeconds: 10
           periodSeconds: 30
           timeoutSeconds: 6
-        volumeMounts:
-        - mountPath: /docker-entrypoint-initdb.d
-          name: rdb-init-sh-override
-      volumes:
-      - configMap:
-          name: rdb-init-sh-override
-        name: rdb-init-sh-override
diff --git a/manifests/rdb-init-sh-override-ConfigMap.yaml b/manifests/rdb-init-sh-override-ConfigMap.yaml