Remove tenant-settings micro-service (#2922)

This service is not relevant when running outside of Grafana Cloud.
grafana · Jan 12, 2024 · ec3deff · ec3deff
1 parent da19f44
commit ec3deff
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 189 deletions.
diff --git a/operations/pyroscope/helm/pyroscope/rendered/micro-services.yaml b/operations/pyroscope/helm/pyroscope/rendered/micro-services.yaml
@@ -146,27 +146,6 @@ spec:
       app.kubernetes.io/instance: pyroscope-dev
       app.kubernetes.io/component: "store-gateway"
 ---
-# Source: pyroscope/templates/deployments-statefulsets.yaml
-apiVersion: policy/v1
-kind: PodDisruptionBudget
-metadata:
-  name: pyroscope-dev-tenant-settings
-  namespace: default
-  labels:
-    helm.sh/chart: pyroscope-1.3.4
-    app.kubernetes.io/name: pyroscope
-    app.kubernetes.io/instance: pyroscope-dev
-    app.kubernetes.io/version: "1.2.1"
-    app.kubernetes.io/managed-by: Helm
-    app.kubernetes.io/component: "tenant-settings"
-spec:
-  maxUnavailable: 1
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: pyroscope
-      app.kubernetes.io/instance: pyroscope-dev
-      app.kubernetes.io/component: "tenant-settings"
----
 # Source: pyroscope/charts/agent/templates/serviceaccount.yaml
 apiVersion: v1
 kind: ServiceAccount
@@ -2029,57 +2008,6 @@ spec:
     app.kubernetes.io/instance: pyroscope-dev
     app.kubernetes.io/component: "store-gateway"
 ---
-# Source: pyroscope/templates/services.yaml
-apiVersion: v1
-kind: Service
-metadata:
-  name: pyroscope-dev-tenant-settings
-  namespace: default
-  labels:
-    helm.sh/chart: pyroscope-1.3.4
-    app.kubernetes.io/name: pyroscope
-    app.kubernetes.io/instance: pyroscope-dev
-    app.kubernetes.io/version: "1.2.1"
-    app.kubernetes.io/managed-by: Helm
-    app.kubernetes.io/component: "tenant-settings"
-spec:
-  type: ClusterIP
-  ports:
-    - port: 4040
-      targetPort: http2
-      protocol: TCP
-      name: http2
-  selector:
-    app.kubernetes.io/name: pyroscope
-    app.kubernetes.io/instance: pyroscope-dev
-    app.kubernetes.io/component: "tenant-settings"
----
-# Source: pyroscope/templates/services.yaml
-apiVersion: v1
-kind: Service
-metadata:
-  name: pyroscope-dev-tenant-settings-headless
-  namespace: default
-  labels:
-    helm.sh/chart: pyroscope-1.3.4
-    app.kubernetes.io/name: pyroscope
-    app.kubernetes.io/instance: pyroscope-dev
-    app.kubernetes.io/version: "1.2.1"
-    app.kubernetes.io/managed-by: Helm
-    app.kubernetes.io/component: "tenant-settings"
-spec:
-  type: ClusterIP
-  clusterIP: None
-  ports:
-    - port: 4040
-      targetPort: http2
-      protocol: TCP
-      name: http2
-  selector:
-    app.kubernetes.io/name: pyroscope
-    app.kubernetes.io/instance: pyroscope-dev
-    app.kubernetes.io/component: "tenant-settings"
----
 # Source: pyroscope/templates/deployments-statefulsets.yaml
 apiVersion: apps/v1
 kind: Deployment
@@ -2456,100 +2384,6 @@ spec:
         - name: data
           emptyDir: {}
 ---
-# Source: pyroscope/templates/deployments-statefulsets.yaml
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: pyroscope-dev-tenant-settings
-  namespace: default
-  labels:
-    helm.sh/chart: pyroscope-1.3.4
-    app.kubernetes.io/name: pyroscope
-    app.kubernetes.io/instance: pyroscope-dev
-    app.kubernetes.io/version: "1.2.1"
-    app.kubernetes.io/managed-by: Helm
-    app.kubernetes.io/component: "tenant-settings"
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: pyroscope
-      app.kubernetes.io/instance: pyroscope-dev
-      app.kubernetes.io/component: "tenant-settings"
-  template:
-    metadata:
-      annotations:
-        checksum/config: 73ee410b751eff68ce1e40efae63c961c9e68b22809bdde76497d302daf8f0a6
-        profiles.grafana.com/cpu.port_name: http2
-        profiles.grafana.com/cpu.scrape: "true"
-        profiles.grafana.com/goroutine.port_name: http2
-        profiles.grafana.com/goroutine.scrape: "true"
-        profiles.grafana.com/memory.port_name: http2
-        profiles.grafana.com/memory.scrape: "true"
-      labels:
-        app.kubernetes.io/name: pyroscope
-        app.kubernetes.io/instance: pyroscope-dev
-        app.kubernetes.io/component: "tenant-settings"
-        name: "tenant-settings"
-    spec:
-      serviceAccountName: pyroscope-dev
-      securityContext:
-        fsGroup: 10001
-        runAsNonRoot: true
-        runAsUser: 10001
-      dnsPolicy: ClusterFirst
-      containers:
-        - name: "tenant-settings"
-          securityContext:
-            {}
-          image: "grafana/pyroscope:1.2.1"
-          imagePullPolicy: IfNotPresent
-          args:
-            - "-target=tenant-settings"
-            - "-self-profiling.disable-push=true"
-            - "-server.http-listen-port=4040"
-            - "-memberlist.cluster-label=default-pyroscope-dev"
-            - "-memberlist.join=dns+pyroscope-dev-memberlist.default.svc.cluster.local.:7946"
-            - "-config.file=/etc/pyroscope/config.yaml"
-            - "-runtime-config.file=/etc/pyroscope/overrides/overrides.yaml"
-            - "-log.level=debug"
-            - "-store-gateway.sharding-ring.replication-factor=3"
-          ports:
-            - name: http2
-              containerPort: 4040
-              protocol: TCP
-            - name: memberlist
-              containerPort: 7946
-              protocol: TCP
-          readinessProbe:
-            httpGet:
-              path: /ready
-              port: http2
-              scheme: HTTP
-          volumeMounts:
-            - name: config
-              mountPath: /etc/pyroscope/config.yaml
-              subPath: config.yaml
-            - name: overrides-config
-              mountPath: /etc/pyroscope/overrides/
-            - name: data
-              mountPath: /data
-          resources:
-            limits:
-              memory: 1Gi
-            requests:
-              cpu: 1
-              memory: 256Mi
-      volumes:
-        - name: config
-          configMap:
-            name: pyroscope-dev-config
-        - name: overrides-config
-          configMap:
-            name: pyroscope-dev-overrides-config
-        - name: data
-          emptyDir: {}
----
 # Source: pyroscope/charts/agent/templates/controllers/statefulset.yaml
 apiVersion: apps/v1
 kind: StatefulSet

diff --git a/operations/pyroscope/helm/pyroscope/values-micro-services.yaml b/operations/pyroscope/helm/pyroscope/values-micro-services.yaml
@@ -84,15 +84,5 @@ pyroscope:
         # Depending on this flag and the number of tenants + blocks that need to be synced on startup, pods can take
         # some time to become ready. This value can be used to ensure Kubernetes waits long enough and reduce errors.
         initialDelaySeconds: 60
-    tenant-settings:
-      kind: Deployment
-      replicaCount: 1
-      resources:
-        limits:
-          memory: 1Gi
-        requests:
-          memory: 256Mi
-          cpu: 1
-
 minio:
   enabled: true
diff --git a/operations/pyroscope/jsonnet/values-micro-services.json b/operations/pyroscope/jsonnet/values-micro-services.json
@@ -105,19 +105,6 @@
             "memory": "8Gi"
           }
         }
-      },
-      "tenant-settings": {
-        "kind": "Deployment",
-        "replicaCount": 1,
-        "resources": {
-          "limits": {
-            "memory": "1Gi"
-          },
-          "requests": {
-            "cpu": 1,
-            "memory": "256Mi"
-          }
-        }
       }
     },
     "extraArgs": {