diff --git a/.chloggen/divide_limit_with_replicas.yaml b/.chloggen/divide_limit_with_replicas.yaml deleted file mode 100644 index 2d73d6635..000000000 --- a/.chloggen/divide_limit_with_replicas.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: enhancement - -# 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: Divide assigned limits with replicas - -# One or more tracking issues related to the change -issues: [721] - -# (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: diff --git a/.chloggen/free_form_config.yaml b/.chloggen/free_form_config.yaml deleted file mode 100755 index a47d863c1..000000000 --- a/.chloggen/free_form_config.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: enhancement - -# 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: Allow override arbitrary tempo configurations - -# One or more tracking issues related to the change -issues: [629] - -# (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: diff --git a/.chloggen/grafana_datasource.yaml b/.chloggen/grafana_datasource.yaml deleted file mode 100644 index 53048c436..000000000 --- a/.chloggen/grafana_datasource.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: enhancement - -# 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: Create Grafana Tempo Operator datasource - -# One or more tracking issues related to the change -issues: [423] - -# (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: diff --git a/.chloggen/ipv6_support.yaml b/.chloggen/ipv6_support.yaml deleted file mode 100755 index 97540a58d..000000000 --- a/.chloggen/ipv6_support.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: enhancement - -# 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: Add .spec.hashRing.memberlist.enableIPv6 option to enable IPv6 support - -# One or more tracking issues related to the change -issues: [704] - -# (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: diff --git a/.chloggen/proxy_envs.yaml b/.chloggen/proxy_envs.yaml deleted file mode 100755 index 385836993..000000000 --- a/.chloggen/proxy_envs.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: enhancement - -# 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: Propagating proxy env vars to component containers - -# One or more tracking issues related to the change -issues: [700] - -# (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: diff --git a/.chloggen/replicas.yaml b/.chloggen/replicas.yaml deleted file mode 100755 index b9f457cd6..000000000 --- a/.chloggen/replicas.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: bug_fix - -# 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: Configure the number of replicas for compactor, querier and query-frontend according to the CR - -# One or more tracking issues related to the change -issues: [712] - -# (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: diff --git a/.chloggen/upgrade_tempo_to_v2.3.1.yaml b/.chloggen/upgrade_tempo_to_v2.3.1.yaml deleted file mode 100644 index 39f14682d..000000000 --- a/.chloggen/upgrade_tempo_to_v2.3.1.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: enhancement - -# 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: Upgrade tempo to v2.3.1 - -# One or more tracking issues related to the change -issues: [729] - -# (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: diff --git a/CHANGELOG.md b/CHANGELOG.md index 6922969ae..dd398da40 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,24 @@ Changes by Version +## 0.7.0 + +### 💡 Enhancements 💡 + +- `operator`: Divide assigned limits with replicas (#721) +- `operator`: Allow override arbitrary tempo configurations (#629) +- `operator`: Create Grafana Tempo Operator datasource (#423) +- `operator`: Add .spec.hashRing.memberlist.enableIPv6 option to enable IPv6 support (#704) +- `operator`: Propagating proxy env vars to component containers (#700) +- `operator`: Upgrade tempo to v2.3.1 (#729) + +### 🧰 Bug fixes 🧰 + +- `operator`: Configure the number of replicas for compactor, querier and query-frontend according to the CR (#712) + +### Components +- Tempo: [v2.3.1](https://github.com/grafana/tempo/releases/tag/v2.3.1) + ## 0.6.0 ### 🛑 Breaking changes 🛑 diff --git a/Makefile b/Makefile index d91fb91d9..448e653f1 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # Current Operator version VERSION_DATE ?= $(shell date -u +'%Y-%m-%dT%H:%M:%SZ') VERSION_PKG ?= github.com/grafana/tempo-operator/internal/version -OPERATOR_VERSION ?= 0.6.0 +OPERATOR_VERSION ?= 0.7.0 TEMPO_VERSION ?= $(shell cat config/manager/manager.yaml | grep -oP "docker.io/grafana/tempo:\K.*") TEMPO_QUERY_VERSION ?= $(shell cat config/manager/manager.yaml | grep -oP "docker.io/grafana/tempo-query:\K.*") COMMIT_SHA = $(shell git rev-parse HEAD) diff --git a/bundle/community/manifests/tempo-operator.clusterserviceversion.yaml b/bundle/community/manifests/tempo-operator.clusterserviceversion.yaml index b04396d8f..bc6736e69 100644 --- a/bundle/community/manifests/tempo-operator.clusterserviceversion.yaml +++ b/bundle/community/manifests/tempo-operator.clusterserviceversion.yaml @@ -42,7 +42,7 @@ metadata: capabilities: Deep Insights categories: Logging & Tracing,Monitoring containerImage: ghcr.io/grafana/tempo-operator/tempo-operator - createdAt: "2024-01-09T16:59:27Z" + createdAt: "2024-01-09T17:14:44Z" description: Create and manage deployments of Tempo, a high-scale distributed tracing backend. operatorframework.io/cluster-monitoring: "true" @@ -51,7 +51,7 @@ metadata: operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 repository: https://github.com/grafana/tempo-operator support: Grafana Tempo Operator SIG - name: tempo-operator.v0.6.0 + name: tempo-operator.v0.7.0 namespace: placeholder spec: apiservicedefinitions: {} @@ -822,7 +822,7 @@ spec: value: quay.io/observatorium/api:main-2023-11-20-81f8fdf - name: RELATED_IMAGE_TEMPO_GATEWAY_OPA value: quay.io/observatorium/opa-openshift:main-2023-10-13-13d8960 - image: ghcr.io/grafana/tempo-operator/tempo-operator:v0.6.0 + image: ghcr.io/grafana/tempo-operator/tempo-operator:v0.7.0 livenessProbe: httpGet: path: /healthz @@ -967,7 +967,7 @@ spec: name: tempo-gateway - image: quay.io/observatorium/opa-openshift:main-2023-10-13-13d8960 name: tempo-gateway-opa - version: 0.6.0 + version: 0.7.0 webhookdefinitions: - admissionReviewVersions: - v1 diff --git a/bundle/openshift/manifests/tempo-operator.clusterserviceversion.yaml b/bundle/openshift/manifests/tempo-operator.clusterserviceversion.yaml index f71400d83..a1d653f66 100644 --- a/bundle/openshift/manifests/tempo-operator.clusterserviceversion.yaml +++ b/bundle/openshift/manifests/tempo-operator.clusterserviceversion.yaml @@ -42,7 +42,7 @@ metadata: capabilities: Deep Insights categories: Logging & Tracing,Monitoring containerImage: ghcr.io/grafana/tempo-operator/tempo-operator - createdAt: "2024-01-09T16:59:25Z" + createdAt: "2024-01-09T17:14:42Z" description: Create and manage deployments of Tempo, a high-scale distributed tracing backend. operatorframework.io/cluster-monitoring: "true" @@ -51,7 +51,7 @@ metadata: operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 repository: https://github.com/grafana/tempo-operator support: Grafana Tempo Operator SIG - name: tempo-operator.v0.6.0 + name: tempo-operator.v0.7.0 namespace: placeholder spec: apiservicedefinitions: {} @@ -822,7 +822,7 @@ spec: value: quay.io/observatorium/api:main-2023-11-20-81f8fdf - name: RELATED_IMAGE_TEMPO_GATEWAY_OPA value: quay.io/observatorium/opa-openshift:main-2023-10-13-13d8960 - image: ghcr.io/grafana/tempo-operator/tempo-operator:v0.6.0 + image: ghcr.io/grafana/tempo-operator/tempo-operator:v0.7.0 livenessProbe: httpGet: path: /healthz @@ -978,7 +978,7 @@ spec: name: tempo-gateway - image: quay.io/observatorium/opa-openshift:main-2023-10-13-13d8960 name: tempo-gateway-opa - version: 0.6.0 + version: 0.7.0 webhookdefinitions: - admissionReviewVersions: - v1 diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index 350e4f1f4..de1c61bdb 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -9,4 +9,4 @@ kind: Kustomization images: - name: controller newName: ghcr.io/grafana/tempo-operator/tempo-operator - newTag: v0.6.0 + newTag: v0.7.0