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.

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

feat: Add TargetAllocator MTLS configuration to operator chart #1404

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ generate-examples:
for chart_name in $(CHARTS); do \
helm dependency build charts/$${chart_name}; \
EXAMPLES_DIR=charts/$${chart_name}/examples; \
EXAMPLES=$$(find $${EXAMPLES_DIR} -type d -maxdepth 1 -mindepth 1 -exec basename \{\} \;); \
EXAMPLES=$$(find $${EXAMPLES_DIR} -maxdepth 1 -mindepth 1 -type d -exec basename \{\} \;); \
for example in $${EXAMPLES}; do \
echo "Generating example: $${example}"; \
VALUES=$$(find $${EXAMPLES_DIR}/$${example} -name *values.yaml); \
Expand All @@ -17,7 +17,7 @@ generate-examples:
mv $${EXAMPLES_DIR}/$${example}/rendered/$${chart_name}/templates/* "$${EXAMPLES_DIR}/$${example}/rendered"; \
SUBCHARTS_DIR=$${EXAMPLES_DIR}/$${example}/rendered/$${chart_name}/charts; \
if [ -d "$${SUBCHARTS_DIR}" ]; then \
SUBCHARTS=$$(find $${SUBCHARTS_DIR} -type d -maxdepth 1 -mindepth 1 -exec basename \{\} \;); \
SUBCHARTS=$$(find $${SUBCHARTS_DIR} -maxdepth 1 -mindepth 1 -type d -exec basename \{\} \;); \
for subchart in $${SUBCHARTS}; do \
mkdir -p "$${EXAMPLES_DIR}/$${example}/rendered/$${subchart}"; \
mv $${SUBCHARTS_DIR}/$${subchart}/templates/* "$${EXAMPLES_DIR}/$${example}/rendered/$${subchart}"; \
Expand All @@ -32,15 +32,15 @@ generate-examples:
check-examples:
for chart_name in $(CHARTS); do \
EXAMPLES_DIR=charts/$${chart_name}/examples; \
EXAMPLES=$$(find $${EXAMPLES_DIR} -type d -maxdepth 1 -mindepth 1 -exec basename \{\} \;); \
EXAMPLES=$$(find $${EXAMPLES_DIR} -maxdepth 1 -mindepth 1 -type d -exec basename \{\} \;); \
for example in $${EXAMPLES}; do \
echo "Checking example: $${example}"; \
VALUES=$$(find $${EXAMPLES_DIR}/$${example} -name *values.yaml); \
for value in $${VALUES}; do \
helm dependency build charts/$${chart_name}; \
helm template example charts/$${chart_name} --namespace default --values $${value} --output-dir "${TMP_DIRECTORY}/$${example}"; \
SUBCHARTS_DIR=${TMP_DIRECTORY}/$${example}/$${chart_name}/charts; \
SUBCHARTS=$$(find $${SUBCHARTS_DIR} -type d -maxdepth 1 -mindepth 1 -exec basename \{\} \;); \
SUBCHARTS=$$(find $${SUBCHARTS_DIR} -maxdepth 1 -mindepth 1 -type d -exec basename \{\} \;); \
for subchart in $${SUBCHARTS}; do \
mkdir -p "${TMP_DIRECTORY}/$${example}/$${chart_name}/templates/$${subchart}"; \
mv ${TMP_DIRECTORY}/$${example}/$${chart_name}/charts/$${subchart}/templates/* "${TMP_DIRECTORY}/$${example}/$${chart_name}/templates/$${subchart}"; \
Expand Down
2 changes: 1 addition & 1 deletion charts/opentelemetry-operator/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v2
name: opentelemetry-operator
version: 0.74.0
version: 0.74.1
description: OpenTelemetry Operator Helm chart for Kubernetes
type: application
home: https://opentelemetry.io/
Expand Down
6 changes: 5 additions & 1 deletion charts/opentelemetry-operator/UPGRADING.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Upgrade guidelines

## 0.74.0 to 0.74.1

Prior to 0.72.1, feature gates could be enabled via the `manager.featureGates` property. As feature gates may require extra configuration to work properly, e.g. deploying extra permissions on the ClusterRole, the chart has been updated to make use of the `manager.featureGatesMap` property which allows the chart to smartly configure feature gates. If the `manager.featureGatesMap` property is set, the old `manager.featureGates` property will be ignored.
thefirstofthe300 marked this conversation as resolved.
Show resolved Hide resolved

## 0.57.0 to 0.58.0

OpenTelemetry Operator [0.99.0](https://github.com/open-telemetry/opentelemetry-operator/releases/tag/v0.99.0) includes a new version of the `OpenTelemetryCollector` CRD. See [this document][v1beta1_migration] for upgrade instructions for the new Operator CRD. Please make sure you also follow the [helm upgrade instructions](./UPGRADING.md#0560-to-0570) for helm chart 0.57.0.
Expand Down Expand Up @@ -29,7 +33,7 @@ You can also delete the CRDs and let Helm recreate them, but doing so will also

## 0.55.3 to 0.56.0

> [!WARNING]
> [!WARNING]
> As part of working towards using the [OpenTelemetry Collector Kubernetes Distro](https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-k8s) by default, the chart now requires users to explicitly set a collector image repository. If you are already explicitly setting a collector image repository this breaking change does not affect you.
If you are using a OpenTelemetry Community distribution of the Collector we recommend you use `otel/opentelemetry-collector-k8s`, but carefully review the [components included in this distribution](https://github.com/open-telemetry/opentelemetry-collector-releases/blob/main/distributions/otelcol-k8s/manifest.yaml) to make sure it includes all the components you use in your configuration. In the future this distribution will become the default image used for the chart.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,11 @@ metadata:
annotations:
cert-manager.io/inject-ca-from: default/example-opentelemetry-operator-serving-cert
labels:
helm.sh/chart: opentelemetry-operator-0.74.0
helm.sh/chart: opentelemetry-operator-0.74.1
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.113.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example

app.kubernetes.io/component: webhook
name: example-opentelemetry-operator-mutation
webhooks:
Expand Down Expand Up @@ -91,12 +90,11 @@ metadata:
annotations:
cert-manager.io/inject-ca-from: default/example-opentelemetry-operator-serving-cert
labels:
helm.sh/chart: opentelemetry-operator-0.74.0
helm.sh/chart: opentelemetry-operator-0.74.1
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.113.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example

app.kubernetes.io/component: webhook
name: example-opentelemetry-operator-validation
webhooks:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,11 @@ apiVersion: cert-manager.io/v1
kind: Certificate
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.74.0
helm.sh/chart: opentelemetry-operator-0.74.1
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.113.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example

app.kubernetes.io/component: webhook
name: example-opentelemetry-operator-serving-cert
namespace: default
Expand All @@ -30,12 +29,11 @@ apiVersion: cert-manager.io/v1
kind: Issuer
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.74.0
helm.sh/chart: opentelemetry-operator-0.74.1
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.113.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example

app.kubernetes.io/component: webhook
name: example-opentelemetry-operator-selfsigned-issuer
namespace: default
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,11 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.74.0
helm.sh/chart: opentelemetry-operator-0.74.1
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.113.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example

app.kubernetes.io/component: controller-manager
name: example-opentelemetry-operator-manager
rules:
Expand Down Expand Up @@ -223,12 +222,11 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.74.0
helm.sh/chart: opentelemetry-operator-0.74.1
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.113.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example

app.kubernetes.io/component: controller-manager
name: example-opentelemetry-operator-metrics
rules:
Expand All @@ -242,12 +240,11 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.74.0
helm.sh/chart: opentelemetry-operator-0.74.1
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.113.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example

app.kubernetes.io/component: controller-manager
name: example-opentelemetry-operator-proxy
rules:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,11 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.74.0
helm.sh/chart: opentelemetry-operator-0.74.1
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.113.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example

app.kubernetes.io/component: controller-manager
name: example-opentelemetry-operator-manager
roleRef:
Expand All @@ -26,12 +25,11 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.74.0
helm.sh/chart: opentelemetry-operator-0.74.1
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.113.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example

app.kubernetes.io/component: controller-manager
name: example-opentelemetry-operator-proxy
roleRef:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,11 @@ apiVersion: apps/v1
kind: Deployment
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.74.0
helm.sh/chart: opentelemetry-operator-0.74.1
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.113.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example

app.kubernetes.io/component: controller-manager
name: example-opentelemetry-operator
namespace: default
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,11 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.74.0
helm.sh/chart: opentelemetry-operator-0.74.1
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.113.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example

app.kubernetes.io/component: controller-manager
name: example-opentelemetry-operator-leader-election
namespace: default
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,11 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.74.0
helm.sh/chart: opentelemetry-operator-0.74.1
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.113.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example

app.kubernetes.io/component: controller-manager
name: example-opentelemetry-operator-leader-election
namespace: default
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,11 @@ apiVersion: v1
kind: Service
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.74.0
helm.sh/chart: opentelemetry-operator-0.74.1
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.113.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example

app.kubernetes.io/component: controller-manager
name: example-opentelemetry-operator
namespace: default
Expand All @@ -32,12 +31,11 @@ apiVersion: v1
kind: Service
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.74.0
helm.sh/chart: opentelemetry-operator-0.74.1
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.113.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example

app.kubernetes.io/component: controller-manager
name: example-opentelemetry-operator-webhook
namespace: default
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,9 @@ metadata:
name: opentelemetry-operator
namespace: default
labels:
helm.sh/chart: opentelemetry-operator-0.74.0
helm.sh/chart: opentelemetry-operator-0.74.1
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.113.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example

app.kubernetes.io/component: controller-manager
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,11 @@ metadata:
name: "example-opentelemetry-operator-cert-manager"
namespace: default
labels:
helm.sh/chart: opentelemetry-operator-0.74.0
helm.sh/chart: opentelemetry-operator-0.74.1
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.113.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example

app.kubernetes.io/component: webhook
annotations:
"helm.sh/hook": test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,11 @@ metadata:
name: "example-opentelemetry-operator-metrics"
namespace: default
labels:
helm.sh/chart: opentelemetry-operator-0.74.0
helm.sh/chart: opentelemetry-operator-0.74.1
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.113.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example

app.kubernetes.io/component: controller-manager
annotations:
"helm.sh/hook": test
Expand Down Expand Up @@ -44,12 +43,11 @@ metadata:
name: "example-opentelemetry-operator-webhook"
namespace: default
labels:
helm.sh/chart: opentelemetry-operator-0.74.0
helm.sh/chart: opentelemetry-operator-0.74.1
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.113.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example

app.kubernetes.io/component: controller-manager
annotations:
"helm.sh/hook": test
Expand Down
Loading
Loading