From db9360d84eaf09ead3aa683f7284f43d231798d1 Mon Sep 17 00:00:00 2001 From: Thibault Mange <22740367+thibaultmg@users.noreply.github.com> Date: Fri, 27 Oct 2023 16:46:36 +0200 Subject: [PATCH] rhobs: remove receive controller service and probes (#633) * remove recceive controller service and probes Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com> * fix Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com> --------- Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com> --- mimic.go | 3 +-- ...orium-metrics-receive-router-template.yaml | 22 +------------------ ...orium-metrics-receive-router-template.yaml | 22 +------------------ 3 files changed, 3 insertions(+), 44 deletions(-) diff --git a/mimic.go b/mimic.go index 15ab5012fd..7193a143bf 100644 --- a/mimic.go +++ b/mimic.go @@ -3,7 +3,6 @@ package main import ( "github.com/bwplotka/mimic" cfgobservatorium "github.com/rhobs/configuration/configuration/observatorium" - services "github.com/rhobs/configuration/services_go" ) func main() { @@ -16,6 +15,6 @@ func main() { cfgobservatorium.GenerateRBAC(gen.With(".tmp", "tenants")) // Generate the manifests for all observatorium instances. - services.Generate(gen.With("services")) + // services.Generate(gen.With("services")) } diff --git a/resources/services/app-sre-stage-01/rhobs/observatorium-metrics-receive-router-template.yaml b/resources/services/app-sre-stage-01/rhobs/observatorium-metrics-receive-router-template.yaml index 10a8540995..9be4fd43e5 100755 --- a/resources/services/app-sre-stage-01/rhobs/observatorium-metrics-receive-router-template.yaml +++ b/resources/services/app-sre-stage-01/rhobs/observatorium-metrics-receive-router-template.yaml @@ -67,13 +67,11 @@ objects: fieldPath: metadata.namespace image: quay.io/observatorium/thanos-receive-controller:main-2023-09-22-f168dd7 imagePullPolicy: IfNotPresent - livenessProbe: {} name: observatorium-thanos-receive-controller ports: - containerPort: 8080 name: http protocol: TCP - readinessProbe: {} resources: limits: cpu: 24Mi @@ -139,31 +137,13 @@ objects: name: observatorium-thanos-receive-controller namespace: rhobs roleRef: - apiGroup: rbac.authorization.k8s.io/v1 + apiGroup: rbac.authorization.k8s.io kind: Role name: observatorium-thanos-receive-controller subjects: - kind: ServiceAccount name: observatorium-thanos-receive-controller namespace: rhobs -- apiVersion: v1 - kind: Service - metadata: - creationTimestamp: null - labels: - app.kubernetes.io/component: kubernetes-controller - app.kubernetes.io/instance: observatorium - app.kubernetes.io/name: thanos-receive-controller - app.kubernetes.io/part-of: observatorium - app.kubernetes.io/version: main-2023-09-22-f168dd7 - name: observatorium-thanos-receive-controller - namespace: rhobs - spec: - selector: - app.kubernetes.io/component: kubernetes-controller - app.kubernetes.io/instance: observatorium - app.kubernetes.io/name: thanos-receive-controller - app.kubernetes.io/part-of: observatorium - apiVersion: v1 kind: ServiceAccount metadata: diff --git a/resources/services/telemeter-prod-01/rhobs/observatorium-metrics-receive-router-template.yaml b/resources/services/telemeter-prod-01/rhobs/observatorium-metrics-receive-router-template.yaml index 14f3c859df..29ec265bd3 100755 --- a/resources/services/telemeter-prod-01/rhobs/observatorium-metrics-receive-router-template.yaml +++ b/resources/services/telemeter-prod-01/rhobs/observatorium-metrics-receive-router-template.yaml @@ -67,13 +67,11 @@ objects: fieldPath: metadata.namespace image: quay.io/observatorium/thanos-receive-controller:main-2023-09-22-f168dd7 imagePullPolicy: IfNotPresent - livenessProbe: {} name: observatorium-thanos-receive-controller ports: - containerPort: 8080 name: http protocol: TCP - readinessProbe: {} resources: limits: cpu: 24Mi @@ -139,31 +137,13 @@ objects: name: observatorium-thanos-receive-controller namespace: rhobs roleRef: - apiGroup: rbac.authorization.k8s.io/v1 + apiGroup: rbac.authorization.k8s.io kind: Role name: observatorium-thanos-receive-controller subjects: - kind: ServiceAccount name: observatorium-thanos-receive-controller namespace: rhobs -- apiVersion: v1 - kind: Service - metadata: - creationTimestamp: null - labels: - app.kubernetes.io/component: kubernetes-controller - app.kubernetes.io/instance: observatorium - app.kubernetes.io/name: thanos-receive-controller - app.kubernetes.io/part-of: observatorium - app.kubernetes.io/version: main-2023-09-22-f168dd7 - name: observatorium-thanos-receive-controller - namespace: rhobs - spec: - selector: - app.kubernetes.io/component: kubernetes-controller - app.kubernetes.io/instance: observatorium - app.kubernetes.io/name: thanos-receive-controller - app.kubernetes.io/part-of: observatorium - apiVersion: v1 kind: ServiceAccount metadata: