remove scalyr sidecar

docs/diagrams/pod.tex

@@ -24,6 +24,7 @@
   component/.style={draw,solid,thick,rounded corners,fill=yellow!20,inner sep=.3cm, blur shadow={shadow blur steps=5,shadow blur extra rounding=1.3pt}},
   border/.style={draw,dashed,rounded corners,fill=gray!20,inner sep=.3cm, blur shadow={shadow blur steps=5,shadow blur extra rounding=1.3pt}},
   volume/.style={draw,solid,thick,rounded corners,fill=blue!20, inner sep=.3cm, blur shadow={shadow blur steps=5,shadow blur extra rounding=1.3pt}},
+  initcontainer/.style={draw,solid,thick,rounded corners,fill=blue!20, inner sep=.3cm, blur shadow={shadow blur steps=5,shadow blur extra rounding=1.3pt}},
   sidecar/.style={draw,solid,thick,rounded corners,fill=blue!20, inner sep=.3cm, blur shadow={shadow blur steps=5,shadow blur extra rounding=1.3pt}},
   k8s-label/.style={draw,solid,thick,rounded corners,fill=blue!20, minimum width=1.5cm, inner sep=.3cm, blur shadow={shadow blur steps=5,shadow blur extra rounding=1.3pt}},
   affinity/.style={draw,solid,thick,rounded corners,fill=blue!20, minimum width=2cm, inner sep=.3cm, blur shadow={shadow blur steps=5,shadow blur extra rounding=1.3pt}},
@@ -60,7 +61,14 @@
            fit=(data-volume)(shm-volume)(tokens-volume)(volumes-label)
       ] (volumes) {}; \&
     \node[component] (spilo) {Spilo}; \&
-    \node[sidecar] (scalyr) {Scalyr}; \& \\ \&
+    \path
+      node[initcontainer] (custom-initcontainer1) {User defined}
+      node[label, right=.25cm of custom-initcontainer1] (initcontainers-middle) {}
+      node[initcontainer, right=.25cm of initcontainers-middle] (custom-initcontainer2) {User defined}
+      node[label, below of=initcontainers-middle] (initcontainers-label) {Custom initcontainers}
+      node[border, behind path,
+           fit=(custom-initcontainer1)(custom-initcontainer2)(initcontainers-label)
+      ] (initcontainers) {}; \&
     \path
       node[component] (patroni) {Patroni}
       node[component, below=.25cm of patroni] (postgres) {PostgreSQL}
@@ -82,7 +90,7 @@
   \draw[to] (pod) to [bend left=25] (volumes);
   \draw[to] (pod) to [bend left=25] (k8s-labels);
   \draw[to] (pod) to [bend right=25] (affinity);
-  \draw[to] (pod) to [bend right=25] (scalyr);
+  \draw[to] (pod) to [bend right=25] (initcontainers);
   \draw[to] (pod) to [bend right=25] (sidecars);
   \draw[to] (pod) -- node[midway,above] {} node[midway,below] {} (spilo);
   \draw[to] (spilo) -- node[midway,above] {} node[midway,below] {} (spilo-components);

docs/reference/command_line_and_environment.md

@@ -41,13 +41,9 @@ The following environment variables are accepted by the operator:
   operator itself.
 
 * **WATCHED_NAMESPACE**
-  the name of the namespace the operator watches. Special '*' character denotes
-  all namespaces. Empty value defaults to the operator namespace. Overrides the
-  `watched_namespace` operator parameter.
-
-* **SCALYR_API_KEY**
-  the value of the Scalyr API key to supply to the pods. Overrides the
-  `scalyr_api_key` operator parameter.
+  the name of the namespace the operator watches. Special **'*'** character
+  denotes all namespaces. Empty value defaults to the operator namespace.
+  Overrides the `watched_namespace` operator parameter.
 
 * **CRD_READY_WAIT_TIMEOUT**
   defines the timeout for the complete `postgresql` CRD creation. When not set

docs/reference/operator_parameters.md

@@ -120,9 +120,9 @@ Those are top-level keys, containing both leaf keys and groups.
   value is also increased). This prevents certain cases of memory overcommitment
   at the cost of overprovisioning memory and potential scheduling problems for
   containers with high memory limits due to the lack of memory on Kubernetes
-  cluster nodes. This affects all containers created by the operator (Postgres,
-  Scalyr sidecar, and other sidecars); to set resources for the operator's own
-  container, change the [operator deployment manually](../manifests/postgres-operator.yaml#L20).
+  cluster nodes. This affects all containers created by the operator incl.
+  sidecars); to set resources for the operator's own container, change the
+  [operator deployment manually](../manifests/postgres-operator.yaml#L20).
   The default is `false`.
 
 ## Postgres users
@@ -523,30 +523,3 @@ configuration they are grouped under the `logging_rest_api` key.
 
 * **cluster_history_entries**
   number of entries in the cluster history ring buffer. The default is `1000`.
-
-## Scalyr options
-
-Those parameters define the resource requests/limits and properties of the
-scalyr sidecar. In the CRD-based configuration they are grouped under the
-`scalyr` key.
-
-* **scalyr_api_key**
-  API key for the Scalyr sidecar. The default is empty.
-
-* **scalyr_image**
-  Docker image for the Scalyr sidecar. The default is empty.
-
-* **scalyr_server_url**
-  server URL for the Scalyr sidecar. The default is `https://upload.eu.scalyr.com`.
-
-* **scalyr_cpu_request**
-  CPU request value for the Scalyr sidecar. The default is `100m`.
-
-* **scalyr_memory_request**
-  Memory request value for the Scalyr sidecar. The default is `50Mi`.
-
-* **scalyr_cpu_limit**
-  CPU limit value for the Scalyr sidecar. The default is `1`.
-
-* **scalyr_memory_limit**
-  Memory limit value for the Scalyr sidecar. The default is `1Gi`.