From 3023b13ad407b861cc19fe6b7263f16bde8c32ec Mon Sep 17 00:00:00 2001 From: Ishwar Kanse Date: Fri, 9 Aug 2024 19:47:21 +0530 Subject: [PATCH] FIx multitenancy and component-replicas test (#1006) Co-authored-by: Andreas Gerstmayr --- .../component-replicas/install-otelcol.yaml | 4 +- .../install-tempo-assert.yaml | 113 +++++++++--------- .../component-replicas/install-tempo.yaml | 2 +- .../scale-tempo-assert.yaml | 113 +++++++++--------- .../component-replicas/scale-tempo.yaml | 2 +- .../component-replicas/verify-traces.yaml | 8 +- .../e2e-openshift/multitenancy/01-assert.yaml | 1 + .../multitenancy/chainsaw-test.yaml | 1 + 8 files changed, 124 insertions(+), 120 deletions(-) diff --git a/tests/e2e-openshift/component-replicas/install-otelcol.yaml b/tests/e2e-openshift/component-replicas/install-otelcol.yaml index 5c6d90c00..f1570bfb5 100644 --- a/tests/e2e-openshift/component-replicas/install-otelcol.yaml +++ b/tests/e2e-openshift/component-replicas/install-otelcol.yaml @@ -23,7 +23,7 @@ spec: exporters: otlp: - endpoint: tempo-simplest-gateway.chainsaw-replicas.svc.cluster.local:8090 + endpoint: tempo-cmpreps-gateway.chainsaw-replicas.svc.cluster.local:8090 tls: insecure: false ca_file: "/var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt" @@ -32,7 +32,7 @@ spec: headers: X-Scope-OrgID: "dev" otlphttp: - endpoint: https://tempo-simplest-gateway.chainsaw-replicas.svc.cluster.local:8080/api/traces/v1/dev + endpoint: https://tempo-cmpreps-gateway.chainsaw-replicas.svc.cluster.local:8080/api/traces/v1/dev tls: insecure: false ca_file: "/var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt" diff --git a/tests/e2e-openshift/component-replicas/install-tempo-assert.yaml b/tests/e2e-openshift/component-replicas/install-tempo-assert.yaml index 2b9688447..5eb7342ae 100644 --- a/tests/e2e-openshift/component-replicas/install-tempo-assert.yaml +++ b/tests/e2e-openshift/component-replicas/install-tempo-assert.yaml @@ -6,17 +6,17 @@ kind: Secret metadata: labels: app.kubernetes.io/component: gateway - app.kubernetes.io/instance: simplest + app.kubernetes.io/instance: cmpreps app.kubernetes.io/managed-by: tempo-operator app.kubernetes.io/name: tempo - name: tempo-simplest-gateway + name: tempo-cmpreps-gateway namespace: chainsaw-replicas ownerReferences: - apiVersion: tempo.grafana.com/v1alpha1 blockOwnerDeletion: true controller: true kind: TempoStack - name: simplest + name: cmpreps type: Opaque --- apiVersion: v1 @@ -26,67 +26,67 @@ kind: ConfigMap metadata: labels: app.kubernetes.io/component: gateway - app.kubernetes.io/instance: simplest + app.kubernetes.io/instance: cmpreps app.kubernetes.io/managed-by: tempo-operator app.kubernetes.io/name: tempo - name: tempo-simplest-gateway + name: tempo-cmpreps-gateway namespace: chainsaw-replicas ownerReferences: - apiVersion: tempo.grafana.com/v1alpha1 blockOwnerDeletion: true controller: true kind: TempoStack - name: simplest + name: cmpreps --- apiVersion: v1 kind: ConfigMap metadata: labels: app.kubernetes.io/component: gateway - app.kubernetes.io/instance: simplest + app.kubernetes.io/instance: cmpreps app.kubernetes.io/managed-by: tempo-operator app.kubernetes.io/name: tempo annotations: service.beta.openshift.io/inject-cabundle: "true" - name: tempo-simplest-gateway-cabundle + name: tempo-cmpreps-gateway-cabundle namespace: chainsaw-replicas ownerReferences: - apiVersion: tempo.grafana.com/v1alpha1 blockOwnerDeletion: true controller: true kind: TempoStack - name: simplest + name: cmpreps --- apiVersion: v1 automountServiceAccountToken: true kind: ServiceAccount metadata: annotations: - serviceaccounts.openshift.io/oauth-redirectreference.dev: '{"kind":"OAuthRedirectReference","apiVersion":"v1","reference":{"kind":"Route","name":"tempo-simplest-gateway"}}' - serviceaccounts.openshift.io/oauth-redirectreference.prod: '{"kind":"OAuthRedirectReference","apiVersion":"v1","reference":{"kind":"Route","name":"tempo-simplest-gateway"}}' + serviceaccounts.openshift.io/oauth-redirectreference.dev: '{"kind":"OAuthRedirectReference","apiVersion":"v1","reference":{"kind":"Route","name":"tempo-cmpreps-gateway"}}' + serviceaccounts.openshift.io/oauth-redirectreference.prod: '{"kind":"OAuthRedirectReference","apiVersion":"v1","reference":{"kind":"Route","name":"tempo-cmpreps-gateway"}}' labels: app.kubernetes.io/component: gateway - app.kubernetes.io/instance: simplest + app.kubernetes.io/instance: cmpreps app.kubernetes.io/managed-by: tempo-operator app.kubernetes.io/name: tempo - name: tempo-simplest-gateway + name: tempo-cmpreps-gateway namespace: chainsaw-replicas ownerReferences: - apiVersion: tempo.grafana.com/v1alpha1 blockOwnerDeletion: true controller: true kind: TempoStack - name: simplest + name: cmpreps --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: app.kubernetes.io/component: gateway - app.kubernetes.io/instance: simplest + app.kubernetes.io/instance: cmpreps app.kubernetes.io/managed-by: tempo-operator app.kubernetes.io/name: tempo - name: tempo-simplest-gateway + name: tempo-cmpreps-gateway rules: - apiGroups: - authentication.k8s.io @@ -106,46 +106,46 @@ kind: ClusterRoleBinding metadata: labels: app.kubernetes.io/component: gateway - app.kubernetes.io/instance: simplest + app.kubernetes.io/instance: cmpreps app.kubernetes.io/managed-by: tempo-operator app.kubernetes.io/name: tempo - name: tempo-simplest-gateway + name: tempo-cmpreps-gateway roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: tempo-simplest-gateway + name: tempo-cmpreps-gateway subjects: - kind: ServiceAccount - name: tempo-simplest-gateway + name: tempo-cmpreps-gateway --- apiVersion: apps/v1 kind: Deployment metadata: labels: app.kubernetes.io/component: gateway - app.kubernetes.io/instance: simplest + app.kubernetes.io/instance: cmpreps app.kubernetes.io/managed-by: tempo-operator app.kubernetes.io/name: tempo - name: tempo-simplest-gateway + name: tempo-cmpreps-gateway namespace: chainsaw-replicas ownerReferences: - apiVersion: tempo.grafana.com/v1alpha1 blockOwnerDeletion: true controller: true kind: TempoStack - name: simplest + name: cmpreps spec: selector: matchLabels: app.kubernetes.io/component: gateway - app.kubernetes.io/instance: simplest + app.kubernetes.io/instance: cmpreps app.kubernetes.io/managed-by: tempo-operator app.kubernetes.io/name: tempo template: metadata: labels: app.kubernetes.io/component: gateway - app.kubernetes.io/instance: simplest + app.kubernetes.io/instance: cmpreps app.kubernetes.io/managed-by: tempo-operator app.kubernetes.io/name: tempo spec: @@ -154,9 +154,9 @@ spec: - --traces.tenant-header=x-scope-orgid - --web.listen=0.0.0.0:8080 - --web.internal.listen=0.0.0.0:8081 - - --traces.write.otlpgrpc.endpoint=tempo-simplest-distributor.chainsaw-replicas.svc.cluster.local:4317 - - --traces.write.otlphttp.endpoint=https://tempo-simplest-distributor.chainsaw-replicas.svc.cluster.local:4318 - - --traces.tempo.endpoint=https://tempo-simplest-query-frontend.chainsaw-replicas.svc.cluster.local:3200 + - --traces.write.otlpgrpc.endpoint=tempo-cmpreps-distributor.chainsaw-replicas.svc.cluster.local:4317 + - --traces.write.otlphttp.endpoint=https://tempo-cmpreps-distributor.chainsaw-replicas.svc.cluster.local:4318 + - --traces.tempo.endpoint=https://tempo-cmpreps-query-frontend.chainsaw-replicas.svc.cluster.local:3200 - --grpc.listen=0.0.0.0:8090 - --rbac.config=/etc/tempo-gateway/cm/rbac.yaml - --tenants.config=/etc/tempo-gateway/secret/tenants.yaml @@ -166,13 +166,14 @@ spec: - --traces.tls.key-file=/var/run/tls/server/tls.key - --traces.tls.cert-file=/var/run/tls/server/tls.crt - --traces.tls.ca-file=/var/run/ca/service-ca.crt + - --traces.tls.watch-certs=true - --tls.server.cert-file=/etc/tempo-gateway/serving-certs/tls.crt - --tls.server.key-file=/etc/tempo-gateway/serving-certs/tls.key - --tls.healthchecks.server-ca-file=/etc/tempo-gateway/cabundle/service-ca.crt - - --tls.healthchecks.server-name=tempo-simplest-gateway.chainsaw-replicas.svc.cluster.local + - --tls.healthchecks.server-name=tempo-cmpreps-gateway.chainsaw-replicas.svc.cluster.local - --web.healthchecks.url=https://localhost:8080 - --tls.client-auth-type=NoClientCert - - --traces.read.endpoint=https://tempo-simplest-query-frontend.chainsaw-replicas.svc.cluster.local:16686 + - --traces.read.endpoint=https://tempo-cmpreps-query-frontend.chainsaw-replicas.svc.cluster.local:16686 livenessProbe: failureThreshold: 10 httpGet: @@ -219,9 +220,9 @@ spec: readOnly: true subPath: tenants.yaml - mountPath: /var/run/ca - name: tempo-simplest-ca-bundle + name: tempo-cmpreps-ca-bundle - mountPath: /var/run/tls/server - name: tempo-simplest-gateway-mtls + name: tempo-cmpreps-gateway-mtls - mountPath: /etc/tempo-gateway/serving-certs name: serving-certs readOnly: true @@ -267,8 +268,8 @@ spec: resources: {} terminationMessagePath: /dev/termination-log terminationMessagePolicy: File - serviceAccount: tempo-simplest-gateway - serviceAccountName: tempo-simplest-gateway + serviceAccount: tempo-cmpreps-gateway + serviceAccountName: tempo-cmpreps-gateway terminationGracePeriodSeconds: 30 volumes: - configMap: @@ -276,7 +277,7 @@ spec: items: - key: rbac.yaml path: rbac.yaml - name: tempo-simplest-gateway + name: tempo-cmpreps-gateway name: rbac - name: tenant secret: @@ -284,22 +285,22 @@ spec: items: - key: tenants.yaml path: tenants.yaml - secretName: tempo-simplest-gateway + secretName: tempo-cmpreps-gateway - configMap: defaultMode: 420 - name: tempo-simplest-ca-bundle - name: tempo-simplest-ca-bundle - - name: tempo-simplest-gateway-mtls + name: tempo-cmpreps-ca-bundle + name: tempo-cmpreps-ca-bundle + - name: tempo-cmpreps-gateway-mtls secret: defaultMode: 420 - secretName: tempo-simplest-gateway-mtls + secretName: tempo-cmpreps-gateway-mtls - name: serving-certs secret: defaultMode: 420 - secretName: tempo-simplest-gateway-tls + secretName: tempo-cmpreps-gateway-tls - configMap: defaultMode: 420 - name: tempo-simplest-gateway-cabundle + name: tempo-cmpreps-gateway-cabundle name: cabundle status: readyReplicas: 1 @@ -310,17 +311,17 @@ kind: Route metadata: labels: app.kubernetes.io/component: gateway - app.kubernetes.io/instance: simplest + app.kubernetes.io/instance: cmpreps app.kubernetes.io/managed-by: tempo-operator app.kubernetes.io/name: tempo - name: tempo-simplest-gateway + name: tempo-cmpreps-gateway namespace: chainsaw-replicas ownerReferences: - apiVersion: tempo.grafana.com/v1alpha1 blockOwnerDeletion: true controller: true kind: TempoStack - name: simplest + name: cmpreps spec: port: targetPort: public @@ -328,7 +329,7 @@ spec: termination: passthrough to: kind: Service - name: tempo-simplest-gateway + name: tempo-cmpreps-gateway weight: 100 wildcardPolicy: None --- @@ -336,20 +337,20 @@ apiVersion: v1 kind: Service metadata: annotations: - service.beta.openshift.io/serving-cert-secret-name: tempo-simplest-gateway-tls + service.beta.openshift.io/serving-cert-secret-name: tempo-cmpreps-gateway-tls labels: app.kubernetes.io/component: gateway - app.kubernetes.io/instance: simplest + app.kubernetes.io/instance: cmpreps app.kubernetes.io/managed-by: tempo-operator app.kubernetes.io/name: tempo - name: tempo-simplest-gateway + name: tempo-cmpreps-gateway namespace: chainsaw-replicas ownerReferences: - apiVersion: tempo.grafana.com/v1alpha1 blockOwnerDeletion: true controller: true kind: TempoStack - name: simplest + name: cmpreps spec: ports: - name: grpc-public @@ -366,7 +367,7 @@ spec: targetPort: public selector: app.kubernetes.io/component: gateway - app.kubernetes.io/instance: simplest + app.kubernetes.io/instance: cmpreps app.kubernetes.io/managed-by: tempo-operator app.kubernetes.io/name: tempo type: ClusterIP @@ -374,7 +375,7 @@ spec: apiVersion: apps/v1 kind: Deployment metadata: - name: tempo-simplest-compactor + name: tempo-cmpreps-compactor namespace: chainsaw-replicas status: readyReplicas: 1 @@ -382,7 +383,7 @@ status: apiVersion: apps/v1 kind: Deployment metadata: - name: tempo-simplest-distributor + name: tempo-cmpreps-distributor namespace: chainsaw-replicas status: readyReplicas: 1 @@ -390,7 +391,7 @@ status: apiVersion: apps/v1 kind: Deployment metadata: - name: tempo-simplest-querier + name: tempo-cmpreps-querier namespace: chainsaw-replicas status: readyReplicas: 1 @@ -398,7 +399,7 @@ status: apiVersion: apps/v1 kind: Deployment metadata: - name: tempo-simplest-query-frontend + name: tempo-cmpreps-query-frontend namespace: chainsaw-replicas status: readyReplicas: 1 @@ -406,7 +407,7 @@ status: apiVersion: apps/v1 kind: StatefulSet metadata: - name: tempo-simplest-ingester + name: tempo-cmpreps-ingester namespace: chainsaw-replicas status: readyReplicas: 1 diff --git a/tests/e2e-openshift/component-replicas/install-tempo.yaml b/tests/e2e-openshift/component-replicas/install-tempo.yaml index 7000ca96f..11ec7b14b 100644 --- a/tests/e2e-openshift/component-replicas/install-tempo.yaml +++ b/tests/e2e-openshift/component-replicas/install-tempo.yaml @@ -2,7 +2,7 @@ apiVersion: tempo.grafana.com/v1alpha1 kind: TempoStack metadata: - name: simplest + name: cmpreps namespace: chainsaw-replicas spec: storage: diff --git a/tests/e2e-openshift/component-replicas/scale-tempo-assert.yaml b/tests/e2e-openshift/component-replicas/scale-tempo-assert.yaml index 3ea56dc47..c23c4bb52 100644 --- a/tests/e2e-openshift/component-replicas/scale-tempo-assert.yaml +++ b/tests/e2e-openshift/component-replicas/scale-tempo-assert.yaml @@ -6,17 +6,17 @@ kind: Secret metadata: labels: app.kubernetes.io/component: gateway - app.kubernetes.io/instance: simplest + app.kubernetes.io/instance: cmpreps app.kubernetes.io/managed-by: tempo-operator app.kubernetes.io/name: tempo - name: tempo-simplest-gateway + name: tempo-cmpreps-gateway namespace: chainsaw-replicas ownerReferences: - apiVersion: tempo.grafana.com/v1alpha1 blockOwnerDeletion: true controller: true kind: TempoStack - name: simplest + name: cmpreps type: Opaque --- apiVersion: v1 @@ -26,67 +26,67 @@ kind: ConfigMap metadata: labels: app.kubernetes.io/component: gateway - app.kubernetes.io/instance: simplest + app.kubernetes.io/instance: cmpreps app.kubernetes.io/managed-by: tempo-operator app.kubernetes.io/name: tempo - name: tempo-simplest-gateway + name: tempo-cmpreps-gateway namespace: chainsaw-replicas ownerReferences: - apiVersion: tempo.grafana.com/v1alpha1 blockOwnerDeletion: true controller: true kind: TempoStack - name: simplest + name: cmpreps --- apiVersion: v1 kind: ConfigMap metadata: labels: app.kubernetes.io/component: gateway - app.kubernetes.io/instance: simplest + app.kubernetes.io/instance: cmpreps app.kubernetes.io/managed-by: tempo-operator app.kubernetes.io/name: tempo annotations: service.beta.openshift.io/inject-cabundle: "true" - name: tempo-simplest-gateway-cabundle + name: tempo-cmpreps-gateway-cabundle namespace: chainsaw-replicas ownerReferences: - apiVersion: tempo.grafana.com/v1alpha1 blockOwnerDeletion: true controller: true kind: TempoStack - name: simplest + name: cmpreps --- apiVersion: v1 automountServiceAccountToken: true kind: ServiceAccount metadata: annotations: - serviceaccounts.openshift.io/oauth-redirectreference.dev: '{"kind":"OAuthRedirectReference","apiVersion":"v1","reference":{"kind":"Route","name":"tempo-simplest-gateway"}}' - serviceaccounts.openshift.io/oauth-redirectreference.prod: '{"kind":"OAuthRedirectReference","apiVersion":"v1","reference":{"kind":"Route","name":"tempo-simplest-gateway"}}' + serviceaccounts.openshift.io/oauth-redirectreference.dev: '{"kind":"OAuthRedirectReference","apiVersion":"v1","reference":{"kind":"Route","name":"tempo-cmpreps-gateway"}}' + serviceaccounts.openshift.io/oauth-redirectreference.prod: '{"kind":"OAuthRedirectReference","apiVersion":"v1","reference":{"kind":"Route","name":"tempo-cmpreps-gateway"}}' labels: app.kubernetes.io/component: gateway - app.kubernetes.io/instance: simplest + app.kubernetes.io/instance: cmpreps app.kubernetes.io/managed-by: tempo-operator app.kubernetes.io/name: tempo - name: tempo-simplest-gateway + name: tempo-cmpreps-gateway namespace: chainsaw-replicas ownerReferences: - apiVersion: tempo.grafana.com/v1alpha1 blockOwnerDeletion: true controller: true kind: TempoStack - name: simplest + name: cmpreps --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: app.kubernetes.io/component: gateway - app.kubernetes.io/instance: simplest + app.kubernetes.io/instance: cmpreps app.kubernetes.io/managed-by: tempo-operator app.kubernetes.io/name: tempo - name: tempo-simplest-gateway + name: tempo-cmpreps-gateway rules: - apiGroups: - authentication.k8s.io @@ -106,46 +106,46 @@ kind: ClusterRoleBinding metadata: labels: app.kubernetes.io/component: gateway - app.kubernetes.io/instance: simplest + app.kubernetes.io/instance: cmpreps app.kubernetes.io/managed-by: tempo-operator app.kubernetes.io/name: tempo - name: tempo-simplest-gateway + name: tempo-cmpreps-gateway roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: tempo-simplest-gateway + name: tempo-cmpreps-gateway subjects: - kind: ServiceAccount - name: tempo-simplest-gateway + name: tempo-cmpreps-gateway --- apiVersion: apps/v1 kind: Deployment metadata: labels: app.kubernetes.io/component: gateway - app.kubernetes.io/instance: simplest + app.kubernetes.io/instance: cmpreps app.kubernetes.io/managed-by: tempo-operator app.kubernetes.io/name: tempo - name: tempo-simplest-gateway + name: tempo-cmpreps-gateway namespace: chainsaw-replicas ownerReferences: - apiVersion: tempo.grafana.com/v1alpha1 blockOwnerDeletion: true controller: true kind: TempoStack - name: simplest + name: cmpreps spec: selector: matchLabels: app.kubernetes.io/component: gateway - app.kubernetes.io/instance: simplest + app.kubernetes.io/instance: cmpreps app.kubernetes.io/managed-by: tempo-operator app.kubernetes.io/name: tempo template: metadata: labels: app.kubernetes.io/component: gateway - app.kubernetes.io/instance: simplest + app.kubernetes.io/instance: cmpreps app.kubernetes.io/managed-by: tempo-operator app.kubernetes.io/name: tempo spec: @@ -154,9 +154,9 @@ spec: - --traces.tenant-header=x-scope-orgid - --web.listen=0.0.0.0:8080 - --web.internal.listen=0.0.0.0:8081 - - --traces.write.otlpgrpc.endpoint=tempo-simplest-distributor.chainsaw-replicas.svc.cluster.local:4317 - - --traces.write.otlphttp.endpoint=https://tempo-simplest-distributor.chainsaw-replicas.svc.cluster.local:4318 - - --traces.tempo.endpoint=https://tempo-simplest-query-frontend.chainsaw-replicas.svc.cluster.local:3200 + - --traces.write.otlpgrpc.endpoint=tempo-cmpreps-distributor.chainsaw-replicas.svc.cluster.local:4317 + - --traces.write.otlphttp.endpoint=https://tempo-cmpreps-distributor.chainsaw-replicas.svc.cluster.local:4318 + - --traces.tempo.endpoint=https://tempo-cmpreps-query-frontend.chainsaw-replicas.svc.cluster.local:3200 - --grpc.listen=0.0.0.0:8090 - --rbac.config=/etc/tempo-gateway/cm/rbac.yaml - --tenants.config=/etc/tempo-gateway/secret/tenants.yaml @@ -166,13 +166,14 @@ spec: - --traces.tls.key-file=/var/run/tls/server/tls.key - --traces.tls.cert-file=/var/run/tls/server/tls.crt - --traces.tls.ca-file=/var/run/ca/service-ca.crt + - --traces.tls.watch-certs=true - --tls.server.cert-file=/etc/tempo-gateway/serving-certs/tls.crt - --tls.server.key-file=/etc/tempo-gateway/serving-certs/tls.key - --tls.healthchecks.server-ca-file=/etc/tempo-gateway/cabundle/service-ca.crt - - --tls.healthchecks.server-name=tempo-simplest-gateway.chainsaw-replicas.svc.cluster.local + - --tls.healthchecks.server-name=tempo-cmpreps-gateway.chainsaw-replicas.svc.cluster.local - --web.healthchecks.url=https://localhost:8080 - --tls.client-auth-type=NoClientCert - - --traces.read.endpoint=https://tempo-simplest-query-frontend.chainsaw-replicas.svc.cluster.local:16686 + - --traces.read.endpoint=https://tempo-cmpreps-query-frontend.chainsaw-replicas.svc.cluster.local:16686 livenessProbe: failureThreshold: 10 httpGet: @@ -219,9 +220,9 @@ spec: readOnly: true subPath: tenants.yaml - mountPath: /var/run/ca - name: tempo-simplest-ca-bundle + name: tempo-cmpreps-ca-bundle - mountPath: /var/run/tls/server - name: tempo-simplest-gateway-mtls + name: tempo-cmpreps-gateway-mtls - mountPath: /etc/tempo-gateway/serving-certs name: serving-certs readOnly: true @@ -267,8 +268,8 @@ spec: resources: {} terminationMessagePath: /dev/termination-log terminationMessagePolicy: File - serviceAccount: tempo-simplest-gateway - serviceAccountName: tempo-simplest-gateway + serviceAccount: tempo-cmpreps-gateway + serviceAccountName: tempo-cmpreps-gateway terminationGracePeriodSeconds: 30 volumes: - configMap: @@ -276,7 +277,7 @@ spec: items: - key: rbac.yaml path: rbac.yaml - name: tempo-simplest-gateway + name: tempo-cmpreps-gateway name: rbac - name: tenant secret: @@ -284,22 +285,22 @@ spec: items: - key: tenants.yaml path: tenants.yaml - secretName: tempo-simplest-gateway + secretName: tempo-cmpreps-gateway - configMap: defaultMode: 420 - name: tempo-simplest-ca-bundle - name: tempo-simplest-ca-bundle - - name: tempo-simplest-gateway-mtls + name: tempo-cmpreps-ca-bundle + name: tempo-cmpreps-ca-bundle + - name: tempo-cmpreps-gateway-mtls secret: defaultMode: 420 - secretName: tempo-simplest-gateway-mtls + secretName: tempo-cmpreps-gateway-mtls - name: serving-certs secret: defaultMode: 420 - secretName: tempo-simplest-gateway-tls + secretName: tempo-cmpreps-gateway-tls - configMap: defaultMode: 420 - name: tempo-simplest-gateway-cabundle + name: tempo-cmpreps-gateway-cabundle name: cabundle status: readyReplicas: ($tempo_replicas) @@ -310,17 +311,17 @@ kind: Route metadata: labels: app.kubernetes.io/component: gateway - app.kubernetes.io/instance: simplest + app.kubernetes.io/instance: cmpreps app.kubernetes.io/managed-by: tempo-operator app.kubernetes.io/name: tempo - name: tempo-simplest-gateway + name: tempo-cmpreps-gateway namespace: chainsaw-replicas ownerReferences: - apiVersion: tempo.grafana.com/v1alpha1 blockOwnerDeletion: true controller: true kind: TempoStack - name: simplest + name: cmpreps spec: port: targetPort: public @@ -328,7 +329,7 @@ spec: termination: passthrough to: kind: Service - name: tempo-simplest-gateway + name: tempo-cmpreps-gateway weight: 100 wildcardPolicy: None --- @@ -336,20 +337,20 @@ apiVersion: v1 kind: Service metadata: annotations: - service.beta.openshift.io/serving-cert-secret-name: tempo-simplest-gateway-tls + service.beta.openshift.io/serving-cert-secret-name: tempo-cmpreps-gateway-tls labels: app.kubernetes.io/component: gateway - app.kubernetes.io/instance: simplest + app.kubernetes.io/instance: cmpreps app.kubernetes.io/managed-by: tempo-operator app.kubernetes.io/name: tempo - name: tempo-simplest-gateway + name: tempo-cmpreps-gateway namespace: chainsaw-replicas ownerReferences: - apiVersion: tempo.grafana.com/v1alpha1 blockOwnerDeletion: true controller: true kind: TempoStack - name: simplest + name: cmpreps spec: ports: - name: grpc-public @@ -366,7 +367,7 @@ spec: targetPort: public selector: app.kubernetes.io/component: gateway - app.kubernetes.io/instance: simplest + app.kubernetes.io/instance: cmpreps app.kubernetes.io/managed-by: tempo-operator app.kubernetes.io/name: tempo type: ClusterIP @@ -374,7 +375,7 @@ spec: apiVersion: apps/v1 kind: Deployment metadata: - name: tempo-simplest-compactor + name: tempo-cmpreps-compactor namespace: chainsaw-replicas status: readyReplicas: ($tempo_replicas) @@ -382,7 +383,7 @@ status: apiVersion: apps/v1 kind: Deployment metadata: - name: tempo-simplest-distributor + name: tempo-cmpreps-distributor namespace: chainsaw-replicas status: readyReplicas: ($tempo_replicas) @@ -390,7 +391,7 @@ status: apiVersion: apps/v1 kind: Deployment metadata: - name: tempo-simplest-querier + name: tempo-cmpreps-querier namespace: chainsaw-replicas status: readyReplicas: ($tempo_replicas) @@ -398,7 +399,7 @@ status: apiVersion: apps/v1 kind: Deployment metadata: - name: tempo-simplest-query-frontend + name: tempo-cmpreps-query-frontend namespace: chainsaw-replicas status: readyReplicas: ($tempo_replicas) @@ -406,7 +407,7 @@ status: apiVersion: apps/v1 kind: StatefulSet metadata: - name: tempo-simplest-ingester + name: tempo-cmpreps-ingester namespace: chainsaw-replicas status: readyReplicas: ($tempo_replicas) diff --git a/tests/e2e-openshift/component-replicas/scale-tempo.yaml b/tests/e2e-openshift/component-replicas/scale-tempo.yaml index 59fbfd566..6d6c275ff 100644 --- a/tests/e2e-openshift/component-replicas/scale-tempo.yaml +++ b/tests/e2e-openshift/component-replicas/scale-tempo.yaml @@ -1,7 +1,7 @@ apiVersion: tempo.grafana.com/v1alpha1 kind: TempoStack metadata: - name: simplest + name: cmpreps namespace: chainsaw-replicas spec: storage: diff --git a/tests/e2e-openshift/component-replicas/verify-traces.yaml b/tests/e2e-openshift/component-replicas/verify-traces.yaml index be8f34ecf..19a96635a 100644 --- a/tests/e2e-openshift/component-replicas/verify-traces.yaml +++ b/tests/e2e-openshift/component-replicas/verify-traces.yaml @@ -20,7 +20,7 @@ spec: -v -G \ --header "Authorization: Bearer $token" \ --cacert /var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt \ - https://tempo-simplest-gateway.chainsaw-replicas.svc:8080/api/traces/v1/dev/api/traces \ + https://tempo-cmpreps-gateway.chainsaw-replicas.svc:8080/api/traces/v1/dev/api/traces \ --data-urlencode "service=grpc" \ | tee /tmp/jaeger.out @@ -53,7 +53,7 @@ spec: -v -G \ --header "Authorization: Bearer $token" \ --cacert /var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt \ - https://tempo-simplest-gateway.chainsaw-replicas.svc:8080/api/traces/v1/dev/tempo/api/search \ + https://tempo-cmpreps-gateway.chainsaw-replicas.svc:8080/api/traces/v1/dev/tempo/api/search \ --data-urlencode 'q={ resource.service.name="grpc" }' \ | tee /tmp/jaeger.out num_traces=$(jq ".traces | length" /tmp/jaeger.out) @@ -85,7 +85,7 @@ spec: -v -G \ --header "Authorization: Bearer $token" \ --cacert /var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt \ - https://tempo-simplest-gateway.chainsaw-replicas.svc:8080/api/traces/v1/dev/api/traces \ + https://tempo-cmpreps-gateway.chainsaw-replicas.svc:8080/api/traces/v1/dev/api/traces \ --data-urlencode "service=http" \ | tee /tmp/jaeger.out @@ -118,7 +118,7 @@ spec: -v -G \ --header "Authorization: Bearer $token" \ --cacert /var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt \ - https://tempo-simplest-gateway.chainsaw-replicas.svc:8080/api/traces/v1/dev/tempo/api/search \ + https://tempo-cmpreps-gateway.chainsaw-replicas.svc:8080/api/traces/v1/dev/tempo/api/search \ --data-urlencode 'q={ resource.service.name="http" }' \ | tee /tmp/jaeger.out num_traces=$(jq ".traces | length" /tmp/jaeger.out) diff --git a/tests/e2e-openshift/multitenancy/01-assert.yaml b/tests/e2e-openshift/multitenancy/01-assert.yaml index 1e4a2eae9..75f05cbb0 100644 --- a/tests/e2e-openshift/multitenancy/01-assert.yaml +++ b/tests/e2e-openshift/multitenancy/01-assert.yaml @@ -166,6 +166,7 @@ spec: - --traces.tls.key-file=/var/run/tls/server/tls.key - --traces.tls.cert-file=/var/run/tls/server/tls.crt - --traces.tls.ca-file=/var/run/ca/service-ca.crt + - --traces.tls.watch-certs=true - --tls.server.cert-file=/etc/tempo-gateway/serving-certs/tls.crt - --tls.server.key-file=/etc/tempo-gateway/serving-certs/tls.key - --tls.healthchecks.server-ca-file=/etc/tempo-gateway/cabundle/service-ca.crt diff --git a/tests/e2e-openshift/multitenancy/chainsaw-test.yaml b/tests/e2e-openshift/multitenancy/chainsaw-test.yaml index 8c36a4061..2565e9443 100755 --- a/tests/e2e-openshift/multitenancy/chainsaw-test.yaml +++ b/tests/e2e-openshift/multitenancy/chainsaw-test.yaml @@ -5,6 +5,7 @@ metadata: creationTimestamp: null name: multitenancy spec: + namespace: chainsaw-multitenancy steps: - name: step-00 try: