Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update tempo to 2.5.0 #958

Merged
merged 8 commits into from
Jul 4, 2024
Merged

Update tempo to 2.5.0 #958

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e2a68a0
Update tempo to 2.5.0
pavolloffay Jun 28, 2024
906843c
Upgrade procedure to tempo 2.5.0
pavolloffay Jul 2, 2024
53c6e7e
Fix
pavolloffay Jul 2, 2024
e8b3a2f
Fix monolithic
pavolloffay Jul 2, 2024
5b67d47
Fix
pavolloffay Jul 3, 2024
edbc377
Fix
pavolloffay Jul 3, 2024
ac85d99
Fix
pavolloffay Jul 4, 2024
4554d6a
Fix
pavolloffay Jul 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions .chloggen/bump-tempo.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: breaking

# The name of the component, or a single word describing the area of concern, (e.g. operator, github action)
component: operator

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Update Tempo to 2.5.0

# One or more tracking issues related to the change
issues: [958]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext: |
Upstream Tempo 2.5.0 image switched user from `root` to `tempo` (10001:10001) and ownership of `/var/tempo`.
Therefore ingester's `/var/tempo/wal` created by previous deployment using Tempo 2.4.1 needs to be updated and
changed ownership. The operator upgrades the `/var/tempo` ownership by deploying a `job` with `securityContext.runAsUser(0)`
and it runs `chown -R /var/tempo 10001:10001`.
1 change: 1 addition & 0 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ COPY . .

# Build
ARG OPERATOR_VERSION
ARG TEMPO_VERSION
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rubenvp8510 do you know how OPERATOR_VERSION is passed in GHA when the image is published? We might need to update the workflow to include the tempo version

RUN make build

# Use distroless as minimal base image to package the manager binary
Expand Down
6 changes: 3 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Current Operator version
OPERATOR_VERSION ?= 0.10.0
TEMPO_VERSION ?= 2.4.1
TEMPO_QUERY_VERSION ?= 2.4.1
TEMPO_VERSION ?= 2.5.0
TEMPO_QUERY_VERSION ?= 2.5.0
TEMPO_GATEWAY_VERSION ?= main-2024-05-29-ca8d2de
TEMPO_GATEWAY_OPA_VERSION ?= main-2024-04-29-914c13f
OAUTH_PROXY_VERSION=4.12
Expand Down Expand Up @@ -159,7 +159,7 @@ run: manifests generate ## Run a controller from your host.

.PHONY: docker-build
docker-build: ## Build docker image with the manager.
docker buildx build --load --platform linux/${ARCH} --build-arg OPERATOR_VERSION -t ${IMG} .
docker buildx build --load --platform linux/${ARCH} --build-arg OPERATOR_VERSION --build-arg TEMPO_VERSION -t ${IMG} .
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

afaics we don't need to pass OPERATOR_VERSION or TEMPO_VERSION here, because in the Dockerfile we run make build, and the Makefile contains the versions (hardcoded).

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That does not work for e.g.

IMG_PREFIX=docker.io/pavolloffay OPERATOR_VERSION=0.11.0 TEMPO_VERSION=2.5.0 make docker-build docker-push deploy

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, yes, but this is only required for testing, right? Anyway, still useful 👍


.PHONY: docker-push
docker-push: ## Push docker image with the manager.
Expand Down
26 changes: 21 additions & 5 deletions bundle/community/manifests/tempo-operator.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ metadata:
capabilities: Deep Insights
categories: Logging & Tracing,Monitoring
containerImage: ghcr.io/grafana/tempo-operator/tempo-operator:v0.10.0
createdAt: "2024-06-28T12:21:20Z"
createdAt: "2024-07-04T12:01:25Z"
description: Create and manage deployments of Tempo, a high-scale distributed
tracing backend.
operatorframework.io/cluster-monitoring: "true"
Expand Down Expand Up @@ -1190,6 +1190,15 @@ spec:
- deployments/finalizers
verbs:
- update
- apiGroups:
- batch
resources:
- jobs
verbs:
- create
- get
- list
- watch
- apiGroups:
- config.openshift.io
resources:
Expand All @@ -1198,6 +1207,13 @@ spec:
- get
- list
- watch
- apiGroups:
- ""
resources:
- persistentvolumeclaims
verbs:
- list
- watch
- apiGroups:
- grafana.integreatly.org
resources:
Expand Down Expand Up @@ -1366,9 +1382,9 @@ spec:
- --config=controller_manager_config.yaml
env:
- name: RELATED_IMAGE_TEMPO
value: docker.io/grafana/tempo:2.4.1
value: docker.io/grafana/tempo:2.5.0
- name: RELATED_IMAGE_TEMPO_QUERY
value: docker.io/grafana/tempo-query:2.4.1
value: docker.io/grafana/tempo-query:2.5.0
- name: RELATED_IMAGE_TEMPO_GATEWAY
value: quay.io/observatorium/api:main-2024-05-29-ca8d2de
- name: RELATED_IMAGE_TEMPO_GATEWAY_OPA
Expand Down Expand Up @@ -1513,9 +1529,9 @@ spec:
provider:
name: Grafana Tempo Operator SIG
relatedImages:
- image: docker.io/grafana/tempo:2.4.1
- image: docker.io/grafana/tempo:2.5.0
name: tempo
- image: docker.io/grafana/tempo-query:2.4.1
- image: docker.io/grafana/tempo-query:2.5.0
name: tempo-query
- image: quay.io/observatorium/api:main-2024-05-29-ca8d2de
name: tempo-gateway
Expand Down
26 changes: 21 additions & 5 deletions bundle/openshift/manifests/tempo-operator.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ metadata:
capabilities: Deep Insights
categories: Logging & Tracing,Monitoring
containerImage: ghcr.io/grafana/tempo-operator/tempo-operator:v0.10.0
createdAt: "2024-06-28T12:21:19Z"
createdAt: "2024-07-04T12:01:24Z"
description: Create and manage deployments of Tempo, a high-scale distributed
tracing backend.
operatorframework.io/cluster-monitoring: "true"
Expand Down Expand Up @@ -1200,6 +1200,15 @@ spec:
- deployments/finalizers
verbs:
- update
- apiGroups:
- batch
resources:
- jobs
verbs:
- create
- get
- list
- watch
- apiGroups:
- config.openshift.io
resources:
Expand All @@ -1208,6 +1217,13 @@ spec:
- get
- list
- watch
- apiGroups:
- ""
resources:
- persistentvolumeclaims
verbs:
- list
- watch
- apiGroups:
- grafana.integreatly.org
resources:
Expand Down Expand Up @@ -1376,9 +1392,9 @@ spec:
- --config=controller_manager_config.yaml
env:
- name: RELATED_IMAGE_TEMPO
value: docker.io/grafana/tempo:2.4.1
value: docker.io/grafana/tempo:2.5.0
- name: RELATED_IMAGE_TEMPO_QUERY
value: docker.io/grafana/tempo-query:2.4.1
value: docker.io/grafana/tempo-query:2.5.0
- name: RELATED_IMAGE_TEMPO_GATEWAY
value: quay.io/observatorium/api:main-2024-05-29-ca8d2de
- name: RELATED_IMAGE_TEMPO_GATEWAY_OPA
Expand Down Expand Up @@ -1534,9 +1550,9 @@ spec:
provider:
name: Grafana Tempo Operator SIG
relatedImages:
- image: docker.io/grafana/tempo:2.4.1
- image: docker.io/grafana/tempo:2.5.0
name: tempo
- image: docker.io/grafana/tempo-query:2.4.1
- image: docker.io/grafana/tempo-query:2.5.0
name: tempo-query
- image: quay.io/observatorium/api:main-2024-05-29-ca8d2de
name: tempo-gateway
Expand Down
4 changes: 2 additions & 2 deletions config/manager/manager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ spec:
- --leader-elect
env:
- name: RELATED_IMAGE_TEMPO
value: docker.io/grafana/tempo:2.4.1
value: docker.io/grafana/tempo:2.5.0
- name: RELATED_IMAGE_TEMPO_QUERY
value: docker.io/grafana/tempo-query:2.4.1
value: docker.io/grafana/tempo-query:2.5.0
- name: RELATED_IMAGE_TEMPO_GATEWAY
value: quay.io/observatorium/api:main-2024-05-29-ca8d2de
- name: RELATED_IMAGE_TEMPO_GATEWAY_OPA
Expand Down
16 changes: 16 additions & 0 deletions config/rbac/role.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,15 @@ rules:
- deployments/finalizers
verbs:
- update
- apiGroups:
- batch
resources:
- jobs
verbs:
- create
- get
- list
- watch
- apiGroups:
- config.openshift.io
resources:
Expand All @@ -54,6 +63,13 @@ rules:
- get
- list
- watch
- apiGroups:
- ""
resources:
- persistentvolumeclaims
verbs:
- list
- watch
- apiGroups:
- grafana.integreatly.org
resources:
Expand Down
4 changes: 4 additions & 0 deletions controllers/tempo/tempostack_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,10 @@ type TempoStackReconciler struct {
// +kubebuilder:rbac:groups=monitoring.coreos.com,resources=servicemonitors;prometheusrules,verbs=get;list;watch;create;update;patch;delete
// +kubebuilder:rbac:groups=grafana.integreatly.org,resources=grafanadatasources,verbs=get;list;watch;create;update;patch;delete

// Upgrate for 0.11.0 to Tempo 2.5
// +kubebuilder:rbac:groups="core",resources=persistentvolumeclaims,verbs=list;watch
// +kubebuilder:rbac:groups=batch,resources=jobs,verbs=get;list;watch;create

//+kubebuilder:rbac:groups=tempo.grafana.com,resources=tempostacks,verbs=get;list;watch;create;update;patch;delete
//+kubebuilder:rbac:groups=tempo.grafana.com,resources=tempostacks/status,verbs=get;update;patch
//+kubebuilder:rbac:groups=tempo.grafana.com,resources=tempostacks/finalizers,verbs=update
Expand Down
Loading