Revert "Enable stateless Rulers (rhobs#151)"

This reverts commit a90e443.

Author: saswatamcode

Makefile

@@ -16,10 +16,6 @@ VENDOR_DIR = vendor
 $(VENDOR_DIR): $(JB) jsonnetfile.json jsonnetfile.lock.json
 	@$(JB) install
 
-.PHONY: update
-update: $(JB) jsonnetfile.json jsonnetfile.lock.json
-	@$(JB) update
-
 JSONNET_SRC = $(shell find . -type f -not -path './*vendor/*' \( -name '*.libsonnet' -o -name '*.jsonnet' \))
 
 .PHONY: format

configuration/observatorium/ruler-remote-write.libsonnet

@@ -183,8 +183,8 @@
           "subdir": "jsonnet/kube-thanos"
         }
       },
-      "version": "336482e12c794f048bd7ec9105281c7b3d76214c",
-      "sum": "8Wh4rZIGaC/LFGbA5astHL27/Lxu+GEq6sPu/ajdjZY="
+      "version": "e1a68590f56034ca1a43d59401f03e72fd01ac5f",
+      "sum": "9g4HwpZ8Vpi950O6x92HNM47Yqa0+Nfv+7YbwwKpt3o="
     },
     {
       "source": {

jsonnetfile.lock.json

@@ -43,63 +43,6 @@ objects:
       app.kubernetes.io/instance: observatorium
       app.kubernetes.io/part-of: observatorium
     name: metric-federation-rules
-- apiVersion: v1
-  data:
-    rw-config.yaml: |-
-      "remote_write":
-      - "headers":
-          "THANOS-TENANT": "0fc2b00e-201b-4c17-b9f2-19d91adc4fd2"
-        "name": "receive-rhobs"
-        "url": "http://observatorium-thanos-receive.${NAMESPACE}.svc.cluster.local:19291/api/v1/receive"
-        "write_relabel_configs":
-        - "action": "keep"
-          "regex": "0fc2b00e-201b-4c17-b9f2-19d91adc4fd2"
-          "source_labels":
-          - "tenant_id"
-      - "headers":
-          "THANOS-TENANT": "FB870BF3-9F3A-44FF-9BF7-D7A047A52F43"
-        "name": "receive-telemeter"
-        "url": "http://observatorium-thanos-receive.${NAMESPACE}.svc.cluster.local:19291/api/v1/receive"
-        "write_relabel_configs":
-        - "action": "keep"
-          "regex": "FB870BF3-9F3A-44FF-9BF7-D7A047A52F43"
-          "source_labels":
-          - "tenant_id"
-      - "headers":
-          "THANOS-TENANT": "AC879303-C60F-4D0D-A6D5-A485CFD638B8"
-        "name": "receive-dptp"
-        "url": "http://observatorium-thanos-receive.${NAMESPACE}.svc.cluster.local:19291/api/v1/receive"
-        "write_relabel_configs":
-        - "action": "keep"
-          "regex": "AC879303-C60F-4D0D-A6D5-A485CFD638B8"
-          "source_labels":
-          - "tenant_id"
-      - "headers":
-          "THANOS-TENANT": "770c1124-6ae8-4324-a9d4-9ce08590094b"
-        "name": "receive-osd"
-        "url": "http://observatorium-thanos-receive.${NAMESPACE}.svc.cluster.local:19291/api/v1/receive"
-        "write_relabel_configs":
-        - "action": "keep"
-          "regex": "770c1124-6ae8-4324-a9d4-9ce08590094b"
-          "source_labels":
-          - "tenant_id"
-      - "headers":
-          "THANOS-TENANT": "63e320cd-622a-4d05-9585-ffd48342633e"
-        "name": "receive-managedkafka"
-        "url": "http://observatorium-thanos-receive.${NAMESPACE}.svc.cluster.local:19291/api/v1/receive"
-        "write_relabel_configs":
-        - "action": "keep"
-          "regex": "63e320cd-622a-4d05-9585-ffd48342633e"
-          "source_labels":
-          - "tenant_id"
-  kind: ConfigMap
-  metadata:
-    annotations:
-      qontract.recycle: "true"
-    labels:
-      app.kubernetes.io/instance: observatorium
-      app.kubernetes.io/part-of: observatorium
-    name: metric-federation-ruler-remote-write-config
 - apiVersion: v1
   kind: Service
   metadata:
@@ -119,9 +62,6 @@ objects:
     - name: http
       port: 10902
       targetPort: 10902
-    - name: reloader
-      port: 9533
-      targetPort: 9533
     selector:
       app.kubernetes.io/component: rule-evaluation-engine
       app.kubernetes.io/instance: metric-federation
@@ -156,7 +96,6 @@ objects:
         - namespace
         - pod
         targetLabel: instance
-    - port: reloader
     namespaceSelector:
       matchNames: ${{NAMESPACES}}
     selector:
@@ -215,7 +154,6 @@ objects:
               "sampler_type": "ratelimiting"
               "service_name": "thanos-rule"
             "type": "JAEGER"
-          - --remote-write.config-file=/etc/thanos/config/metric-federation-ruler-remote-write-config/rw-config.yaml
           env:
           - name: NAME
             valueFrom:
@@ -241,7 +179,6 @@ objects:
                 key: aws_secret_access_key
                 name: ${THANOS_S3_SECRET}
           image: ${THANOS_IMAGE}:${THANOS_IMAGE_TAG}
-          imagePullPolicy: IfNotPresent
           livenessProbe:
             failureThreshold: 24
             httpGet:
@@ -255,8 +192,6 @@ objects:
             name: grpc
           - containerPort: 10902
             name: http
-          - containerPort: 9533
-            name: reloader
           readinessProbe:
             failureThreshold: 18
             httpGet:
@@ -279,21 +214,14 @@ objects:
             readOnly: false
           - mountPath: /etc/thanos/rules/metric-federation-rules
             name: metric-federation-rules
-          - mountPath: /etc/thanos/config/metric-federation-ruler-remote-write-config
-            name: metric-federation-ruler-remote-write-config
-            readOnly: true
         - args:
           - -webhook-url=http://localhost:10902/-/reload
           - -volume-dir=/etc/thanos/rules/metric-federation-rules
-          - -volume-dir=/etc/thanos/config/metric-federation-ruler-remote-write-config
           image: ${CONFIGMAP_RELOADER_IMAGE}:${CONFIGMAP_RELOADER_IMAGE_TAG}
-          imagePullPolicy: IfNotPresent
           name: configmap-reloader
           volumeMounts:
           - mountPath: /etc/thanos/rules/metric-federation-rules
             name: metric-federation-rules
-          - mountPath: /etc/thanos/config/metric-federation-ruler-remote-write-config
-            name: metric-federation-ruler-remote-write-config
         - args:
           - --reporter.grpc.host-port=dns:///jaeger-collector-headless.${JAEGER_COLLECTOR_NAMESPACE}.svc:14250
           - --reporter.type=grpc
@@ -330,16 +258,13 @@ objects:
               cpu: 32m
               memory: 64Mi
         nodeSelector:
-          kubernetes.io/os: linux
+          beta.kubernetes.io/os: linux
         securityContext: {}
         serviceAccountName: ${SERVICE_ACCOUNT_NAME}
         volumes:
         - configMap:
             name: metric-federation-rules
           name: metric-federation-rules
-        - configMap:
-            name: metric-federation-ruler-remote-write-config
-          name: metric-federation-ruler-remote-write-config
     volumeClaimTemplates:
     - metadata:
         labels: