Skip to content

Commit be4c265

Browse files
authored
Add fallbackstrategy to values schema, and fix examples in values (#1524)
1 parent dead2fc commit be4c265

25 files changed

+52
-44
lines changed

charts/opentelemetry-operator/Chart.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apiVersion: v2
22
name: opentelemetry-operator
3-
version: 0.80.0
3+
version: 0.80.1
44
description: OpenTelemetry Operator Helm chart for Kubernetes
55
type: application
66
home: https://opentelemetry.io/

charts/opentelemetry-operator/examples/default/rendered/admission-webhooks/operator-webhook-with-cert-manager.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
annotations:
77
cert-manager.io/inject-ca-from: default/example-opentelemetry-operator-serving-cert
88
labels:
9-
helm.sh/chart: opentelemetry-operator-0.80.0
9+
helm.sh/chart: opentelemetry-operator-0.80.1
1010
app.kubernetes.io/name: opentelemetry-operator
1111
app.kubernetes.io/version: "0.117.0"
1212
app.kubernetes.io/managed-by: Helm
@@ -90,7 +90,7 @@ metadata:
9090
annotations:
9191
cert-manager.io/inject-ca-from: default/example-opentelemetry-operator-serving-cert
9292
labels:
93-
helm.sh/chart: opentelemetry-operator-0.80.0
93+
helm.sh/chart: opentelemetry-operator-0.80.1
9494
app.kubernetes.io/name: opentelemetry-operator
9595
app.kubernetes.io/version: "0.117.0"
9696
app.kubernetes.io/managed-by: Helm

charts/opentelemetry-operator/examples/default/rendered/certmanager.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: cert-manager.io/v1
44
kind: Certificate
55
metadata:
66
labels:
7-
helm.sh/chart: opentelemetry-operator-0.80.0
7+
helm.sh/chart: opentelemetry-operator-0.80.1
88
app.kubernetes.io/name: opentelemetry-operator
99
app.kubernetes.io/version: "0.117.0"
1010
app.kubernetes.io/managed-by: Helm
@@ -29,7 +29,7 @@ apiVersion: cert-manager.io/v1
2929
kind: Issuer
3030
metadata:
3131
labels:
32-
helm.sh/chart: opentelemetry-operator-0.80.0
32+
helm.sh/chart: opentelemetry-operator-0.80.1
3333
app.kubernetes.io/name: opentelemetry-operator
3434
app.kubernetes.io/version: "0.117.0"
3535
app.kubernetes.io/managed-by: Helm

charts/opentelemetry-operator/examples/default/rendered/clusterrole.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
44
kind: ClusterRole
55
metadata:
66
labels:
7-
helm.sh/chart: opentelemetry-operator-0.80.0
7+
helm.sh/chart: opentelemetry-operator-0.80.1
88
app.kubernetes.io/name: opentelemetry-operator
99
app.kubernetes.io/version: "0.117.0"
1010
app.kubernetes.io/managed-by: Helm
@@ -222,7 +222,7 @@ apiVersion: rbac.authorization.k8s.io/v1
222222
kind: ClusterRole
223223
metadata:
224224
labels:
225-
helm.sh/chart: opentelemetry-operator-0.80.0
225+
helm.sh/chart: opentelemetry-operator-0.80.1
226226
app.kubernetes.io/name: opentelemetry-operator
227227
app.kubernetes.io/version: "0.117.0"
228228
app.kubernetes.io/managed-by: Helm
@@ -240,7 +240,7 @@ apiVersion: rbac.authorization.k8s.io/v1
240240
kind: ClusterRole
241241
metadata:
242242
labels:
243-
helm.sh/chart: opentelemetry-operator-0.80.0
243+
helm.sh/chart: opentelemetry-operator-0.80.1
244244
app.kubernetes.io/name: opentelemetry-operator
245245
app.kubernetes.io/version: "0.117.0"
246246
app.kubernetes.io/managed-by: Helm

charts/opentelemetry-operator/examples/default/rendered/clusterrolebinding.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
44
kind: ClusterRoleBinding
55
metadata:
66
labels:
7-
helm.sh/chart: opentelemetry-operator-0.80.0
7+
helm.sh/chart: opentelemetry-operator-0.80.1
88
app.kubernetes.io/name: opentelemetry-operator
99
app.kubernetes.io/version: "0.117.0"
1010
app.kubernetes.io/managed-by: Helm
@@ -25,7 +25,7 @@ apiVersion: rbac.authorization.k8s.io/v1
2525
kind: ClusterRoleBinding
2626
metadata:
2727
labels:
28-
helm.sh/chart: opentelemetry-operator-0.80.0
28+
helm.sh/chart: opentelemetry-operator-0.80.1
2929
app.kubernetes.io/name: opentelemetry-operator
3030
app.kubernetes.io/version: "0.117.0"
3131
app.kubernetes.io/managed-by: Helm

charts/opentelemetry-operator/examples/default/rendered/deployment.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: apps/v1
44
kind: Deployment
55
metadata:
66
labels:
7-
helm.sh/chart: opentelemetry-operator-0.80.0
7+
helm.sh/chart: opentelemetry-operator-0.80.1
88
app.kubernetes.io/name: opentelemetry-operator
99
app.kubernetes.io/version: "0.117.0"
1010
app.kubernetes.io/managed-by: Helm

charts/opentelemetry-operator/examples/default/rendered/role.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
44
kind: Role
55
metadata:
66
labels:
7-
helm.sh/chart: opentelemetry-operator-0.80.0
7+
helm.sh/chart: opentelemetry-operator-0.80.1
88
app.kubernetes.io/name: opentelemetry-operator
99
app.kubernetes.io/version: "0.117.0"
1010
app.kubernetes.io/managed-by: Helm

charts/opentelemetry-operator/examples/default/rendered/rolebinding.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
44
kind: RoleBinding
55
metadata:
66
labels:
7-
helm.sh/chart: opentelemetry-operator-0.80.0
7+
helm.sh/chart: opentelemetry-operator-0.80.1
88
app.kubernetes.io/name: opentelemetry-operator
99
app.kubernetes.io/version: "0.117.0"
1010
app.kubernetes.io/managed-by: Helm

charts/opentelemetry-operator/examples/default/rendered/service.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: v1
44
kind: Service
55
metadata:
66
labels:
7-
helm.sh/chart: opentelemetry-operator-0.80.0
7+
helm.sh/chart: opentelemetry-operator-0.80.1
88
app.kubernetes.io/name: opentelemetry-operator
99
app.kubernetes.io/version: "0.117.0"
1010
app.kubernetes.io/managed-by: Helm
@@ -31,7 +31,7 @@ apiVersion: v1
3131
kind: Service
3232
metadata:
3333
labels:
34-
helm.sh/chart: opentelemetry-operator-0.80.0
34+
helm.sh/chart: opentelemetry-operator-0.80.1
3535
app.kubernetes.io/name: opentelemetry-operator
3636
app.kubernetes.io/version: "0.117.0"
3737
app.kubernetes.io/managed-by: Helm

charts/opentelemetry-operator/examples/default/rendered/serviceaccount.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: opentelemetry-operator
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-operator-0.80.0
9+
helm.sh/chart: opentelemetry-operator-0.80.1
1010
app.kubernetes.io/name: opentelemetry-operator
1111
app.kubernetes.io/version: "0.117.0"
1212
app.kubernetes.io/managed-by: Helm

charts/opentelemetry-operator/examples/default/rendered/tests/test-certmanager-connection.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: "example-opentelemetry-operator-cert-manager"
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-operator-0.80.0
9+
helm.sh/chart: opentelemetry-operator-0.80.1
1010
app.kubernetes.io/name: opentelemetry-operator
1111
app.kubernetes.io/version: "0.117.0"
1212
app.kubernetes.io/managed-by: Helm

charts/opentelemetry-operator/examples/default/rendered/tests/test-service-connection.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: "example-opentelemetry-operator-metrics"
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-operator-0.80.0
9+
helm.sh/chart: opentelemetry-operator-0.80.1
1010
app.kubernetes.io/name: opentelemetry-operator
1111
app.kubernetes.io/version: "0.117.0"
1212
app.kubernetes.io/managed-by: Helm
@@ -43,7 +43,7 @@ metadata:
4343
name: "example-opentelemetry-operator-webhook"
4444
namespace: default
4545
labels:
46-
helm.sh/chart: opentelemetry-operator-0.80.0
46+
helm.sh/chart: opentelemetry-operator-0.80.1
4747
app.kubernetes.io/name: opentelemetry-operator
4848
app.kubernetes.io/version: "0.117.0"
4949
app.kubernetes.io/managed-by: Helm

charts/opentelemetry-operator/examples/feature-gates/rendered/admission-webhooks/operator-webhook-with-cert-manager.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
annotations:
77
cert-manager.io/inject-ca-from: default/example-opentelemetry-operator-serving-cert
88
labels:
9-
helm.sh/chart: opentelemetry-operator-0.80.0
9+
helm.sh/chart: opentelemetry-operator-0.80.1
1010
app.kubernetes.io/name: opentelemetry-operator
1111
app.kubernetes.io/version: "0.117.0"
1212
app.kubernetes.io/managed-by: Helm
@@ -90,7 +90,7 @@ metadata:
9090
annotations:
9191
cert-manager.io/inject-ca-from: default/example-opentelemetry-operator-serving-cert
9292
labels:
93-
helm.sh/chart: opentelemetry-operator-0.80.0
93+
helm.sh/chart: opentelemetry-operator-0.80.1
9494
app.kubernetes.io/name: opentelemetry-operator
9595
app.kubernetes.io/version: "0.117.0"
9696
app.kubernetes.io/managed-by: Helm

charts/opentelemetry-operator/examples/feature-gates/rendered/certmanager.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: cert-manager.io/v1
44
kind: Certificate
55
metadata:
66
labels:
7-
helm.sh/chart: opentelemetry-operator-0.80.0
7+
helm.sh/chart: opentelemetry-operator-0.80.1
88
app.kubernetes.io/name: opentelemetry-operator
99
app.kubernetes.io/version: "0.117.0"
1010
app.kubernetes.io/managed-by: Helm
@@ -29,7 +29,7 @@ apiVersion: cert-manager.io/v1
2929
kind: Issuer
3030
metadata:
3131
labels:
32-
helm.sh/chart: opentelemetry-operator-0.80.0
32+
helm.sh/chart: opentelemetry-operator-0.80.1
3333
app.kubernetes.io/name: opentelemetry-operator
3434
app.kubernetes.io/version: "0.117.0"
3535
app.kubernetes.io/managed-by: Helm

charts/opentelemetry-operator/examples/feature-gates/rendered/clusterrole.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
44
kind: ClusterRole
55
metadata:
66
labels:
7-
helm.sh/chart: opentelemetry-operator-0.80.0
7+
helm.sh/chart: opentelemetry-operator-0.80.1
88
app.kubernetes.io/name: opentelemetry-operator
99
app.kubernetes.io/version: "0.117.0"
1010
app.kubernetes.io/managed-by: Helm
@@ -256,7 +256,7 @@ apiVersion: rbac.authorization.k8s.io/v1
256256
kind: ClusterRole
257257
metadata:
258258
labels:
259-
helm.sh/chart: opentelemetry-operator-0.80.0
259+
helm.sh/chart: opentelemetry-operator-0.80.1
260260
app.kubernetes.io/name: opentelemetry-operator
261261
app.kubernetes.io/version: "0.117.0"
262262
app.kubernetes.io/managed-by: Helm
@@ -274,7 +274,7 @@ apiVersion: rbac.authorization.k8s.io/v1
274274
kind: ClusterRole
275275
metadata:
276276
labels:
277-
helm.sh/chart: opentelemetry-operator-0.80.0
277+
helm.sh/chart: opentelemetry-operator-0.80.1
278278
app.kubernetes.io/name: opentelemetry-operator
279279
app.kubernetes.io/version: "0.117.0"
280280
app.kubernetes.io/managed-by: Helm

charts/opentelemetry-operator/examples/feature-gates/rendered/clusterrolebinding.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
44
kind: ClusterRoleBinding
55
metadata:
66
labels:
7-
helm.sh/chart: opentelemetry-operator-0.80.0
7+
helm.sh/chart: opentelemetry-operator-0.80.1
88
app.kubernetes.io/name: opentelemetry-operator
99
app.kubernetes.io/version: "0.117.0"
1010
app.kubernetes.io/managed-by: Helm
@@ -25,7 +25,7 @@ apiVersion: rbac.authorization.k8s.io/v1
2525
kind: ClusterRoleBinding
2626
metadata:
2727
labels:
28-
helm.sh/chart: opentelemetry-operator-0.80.0
28+
helm.sh/chart: opentelemetry-operator-0.80.1
2929
app.kubernetes.io/name: opentelemetry-operator
3030
app.kubernetes.io/version: "0.117.0"
3131
app.kubernetes.io/managed-by: Helm

charts/opentelemetry-operator/examples/feature-gates/rendered/deployment.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: apps/v1
44
kind: Deployment
55
metadata:
66
labels:
7-
helm.sh/chart: opentelemetry-operator-0.80.0
7+
helm.sh/chart: opentelemetry-operator-0.80.1
88
app.kubernetes.io/name: opentelemetry-operator
99
app.kubernetes.io/version: "0.117.0"
1010
app.kubernetes.io/managed-by: Helm

charts/opentelemetry-operator/examples/feature-gates/rendered/role.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
44
kind: Role
55
metadata:
66
labels:
7-
helm.sh/chart: opentelemetry-operator-0.80.0
7+
helm.sh/chart: opentelemetry-operator-0.80.1
88
app.kubernetes.io/name: opentelemetry-operator
99
app.kubernetes.io/version: "0.117.0"
1010
app.kubernetes.io/managed-by: Helm

charts/opentelemetry-operator/examples/feature-gates/rendered/rolebinding.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
44
kind: RoleBinding
55
metadata:
66
labels:
7-
helm.sh/chart: opentelemetry-operator-0.80.0
7+
helm.sh/chart: opentelemetry-operator-0.80.1
88
app.kubernetes.io/name: opentelemetry-operator
99
app.kubernetes.io/version: "0.117.0"
1010
app.kubernetes.io/managed-by: Helm

charts/opentelemetry-operator/examples/feature-gates/rendered/service.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: v1
44
kind: Service
55
metadata:
66
labels:
7-
helm.sh/chart: opentelemetry-operator-0.80.0
7+
helm.sh/chart: opentelemetry-operator-0.80.1
88
app.kubernetes.io/name: opentelemetry-operator
99
app.kubernetes.io/version: "0.117.0"
1010
app.kubernetes.io/managed-by: Helm
@@ -31,7 +31,7 @@ apiVersion: v1
3131
kind: Service
3232
metadata:
3333
labels:
34-
helm.sh/chart: opentelemetry-operator-0.80.0
34+
helm.sh/chart: opentelemetry-operator-0.80.1
3535
app.kubernetes.io/name: opentelemetry-operator
3636
app.kubernetes.io/version: "0.117.0"
3737
app.kubernetes.io/managed-by: Helm

charts/opentelemetry-operator/examples/feature-gates/rendered/serviceaccount.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: opentelemetry-operator
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-operator-0.80.0
9+
helm.sh/chart: opentelemetry-operator-0.80.1
1010
app.kubernetes.io/name: opentelemetry-operator
1111
app.kubernetes.io/version: "0.117.0"
1212
app.kubernetes.io/managed-by: Helm

charts/opentelemetry-operator/examples/feature-gates/rendered/tests/test-certmanager-connection.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: "example-opentelemetry-operator-cert-manager"
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-operator-0.80.0
9+
helm.sh/chart: opentelemetry-operator-0.80.1
1010
app.kubernetes.io/name: opentelemetry-operator
1111
app.kubernetes.io/version: "0.117.0"
1212
app.kubernetes.io/managed-by: Helm

charts/opentelemetry-operator/examples/feature-gates/rendered/tests/test-service-connection.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: "example-opentelemetry-operator-metrics"
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-operator-0.80.0
9+
helm.sh/chart: opentelemetry-operator-0.80.1
1010
app.kubernetes.io/name: opentelemetry-operator
1111
app.kubernetes.io/version: "0.117.0"
1212
app.kubernetes.io/managed-by: Helm
@@ -43,7 +43,7 @@ metadata:
4343
name: "example-opentelemetry-operator-webhook"
4444
namespace: default
4545
labels:
46-
helm.sh/chart: opentelemetry-operator-0.80.0
46+
helm.sh/chart: opentelemetry-operator-0.80.1
4747
app.kubernetes.io/name: opentelemetry-operator
4848
app.kubernetes.io/version: "0.117.0"
4949
app.kubernetes.io/managed-by: Helm

charts/opentelemetry-operator/values.schema.json

+8
Original file line numberDiff line numberDiff line change
@@ -530,6 +530,14 @@
530530
false
531531
]
532532
},
533+
"operator.targetallocator.fallbackstrategy": {
534+
"type": "boolean",
535+
"default": false,
536+
"title": "Whether to enable fallback allocation strategy the Target Allocator",
537+
"examples": [
538+
false
539+
]
540+
},
533541
"operator.collector.targetallocatorcr": {
534542
"type": "boolean",
535543
"default": false,

charts/opentelemetry-operator/values.yaml

+7-7
Original file line numberDiff line numberDiff line change
@@ -79,13 +79,13 @@ manager:
7979
# The featureGatesMap will enable or disable specific feature gates in the operator as well as deploy any prerequisites for the feature gate.
8080
# If this property is not an empty map, the featureGates property will be ignored.
8181
featureGatesMap: {}
82-
# targetAllocatorMtls: false
83-
# targetAllocatorCR: false
84-
# targetAllocatorFallbackStrategy: false
85-
# nativeSideCarContainers: false
86-
# prometheusOperator: false
87-
# golangFlags: false
88-
# collectorDefaultConfig: false
82+
# operator.targetallocator.mtls: false
83+
# operator.targetallocator.fallbackstrategy: false
84+
# operator.collector.targetallocatorcr: false
85+
# operator.sidecarcontainers.native: false
86+
# operator.observability.prometheus: false
87+
# operator.golang.flags: false
88+
# operator.collector.default.config: false
8989
ports:
9090
metricsPort: 8080
9191
webhookPort: 9443

0 commit comments

Comments
 (0)