Skip to content

Commit

Permalink
[Operator] Allow setting of manager service account name, default val…
Browse files Browse the repository at this point in the history
…ue if not used (#1145)

* Allow setting of manager service account name, default value if not used

* Upped chart version, ran make

* Clean up comments in values.yaml, set name:

* Update charts/opentelemetry-operator/values.yaml

Co-authored-by: Jacob Aronoff <[email protected]>

* Update fork, bump chart version

---------

Co-authored-by: Jacob Aronoff <[email protected]>
  • Loading branch information
Gholie and jaronoff97 authored Apr 19, 2024
1 parent 8467a3e commit 3b82d8f
Show file tree
Hide file tree
Showing 14 changed files with 29 additions and 20 deletions.
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.55.2
version: 0.55.3
description: OpenTelemetry Operator Helm chart for Kubernetes
type: application
home: https://opentelemetry.io/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
annotations:
cert-manager.io/inject-ca-from: default/example-opentelemetry-operator-serving-cert
labels:
helm.sh/chart: opentelemetry-operator-0.55.2
helm.sh/chart: opentelemetry-operator-0.55.3
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.98.0"
app.kubernetes.io/managed-by: Helm
Expand Down Expand Up @@ -91,7 +91,7 @@ metadata:
annotations:
cert-manager.io/inject-ca-from: default/example-opentelemetry-operator-serving-cert
labels:
helm.sh/chart: opentelemetry-operator-0.55.2
helm.sh/chart: opentelemetry-operator-0.55.3
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.98.0"
app.kubernetes.io/managed-by: Helm
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: cert-manager.io/v1
kind: Certificate
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.55.2
helm.sh/chart: opentelemetry-operator-0.55.3
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.98.0"
app.kubernetes.io/managed-by: Helm
Expand All @@ -30,7 +30,7 @@ apiVersion: cert-manager.io/v1
kind: Issuer
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.55.2
helm.sh/chart: opentelemetry-operator-0.55.3
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.98.0"
app.kubernetes.io/managed-by: Helm
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.55.2
helm.sh/chart: opentelemetry-operator-0.55.3
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.98.0"
app.kubernetes.io/managed-by: Helm
Expand Down Expand Up @@ -223,7 +223,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.55.2
helm.sh/chart: opentelemetry-operator-0.55.3
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.98.0"
app.kubernetes.io/managed-by: Helm
Expand All @@ -242,7 +242,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.55.2
helm.sh/chart: opentelemetry-operator-0.55.3
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.98.0"
app.kubernetes.io/managed-by: Helm
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.55.2
helm.sh/chart: opentelemetry-operator-0.55.3
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.98.0"
app.kubernetes.io/managed-by: Helm
Expand All @@ -26,7 +26,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.55.2
helm.sh/chart: opentelemetry-operator-0.55.3
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.98.0"
app.kubernetes.io/managed-by: Helm
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: apps/v1
kind: Deployment
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.55.2
helm.sh/chart: opentelemetry-operator-0.55.3
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.98.0"
app.kubernetes.io/managed-by: Helm
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.55.2
helm.sh/chart: opentelemetry-operator-0.55.3
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.98.0"
app.kubernetes.io/managed-by: Helm
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.55.2
helm.sh/chart: opentelemetry-operator-0.55.3
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.98.0"
app.kubernetes.io/managed-by: Helm
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: v1
kind: Service
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.55.2
helm.sh/chart: opentelemetry-operator-0.55.3
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.98.0"
app.kubernetes.io/managed-by: Helm
Expand Down Expand Up @@ -32,7 +32,7 @@ apiVersion: v1
kind: Service
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.55.2
helm.sh/chart: opentelemetry-operator-0.55.3
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.98.0"
app.kubernetes.io/managed-by: Helm
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: opentelemetry-operator
namespace: default
labels:
helm.sh/chart: opentelemetry-operator-0.55.2
helm.sh/chart: opentelemetry-operator-0.55.3
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.98.0"
app.kubernetes.io/managed-by: Helm
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: "example-opentelemetry-operator-cert-manager"
namespace: default
labels:
helm.sh/chart: opentelemetry-operator-0.55.2
helm.sh/chart: opentelemetry-operator-0.55.3
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.98.0"
app.kubernetes.io/managed-by: Helm
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: "example-opentelemetry-operator-metrics"
namespace: default
labels:
helm.sh/chart: opentelemetry-operator-0.55.2
helm.sh/chart: opentelemetry-operator-0.55.3
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.98.0"
app.kubernetes.io/managed-by: Helm
Expand Down Expand Up @@ -44,7 +44,7 @@ metadata:
name: "example-opentelemetry-operator-webhook"
namespace: default
labels:
helm.sh/chart: opentelemetry-operator-0.55.2
helm.sh/chart: opentelemetry-operator-0.55.3
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.98.0"
app.kubernetes.io/managed-by: Helm
Expand Down
8 changes: 8 additions & 0 deletions charts/opentelemetry-operator/values.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -641,6 +641,14 @@
"required": [],
"properties": {},
"examples": [{}]
},
"name": {
"type": "string",
"default": "",
"title": "The name of the service account",
"examples": [
"opentelemetry-operator"
]
}
},
"examples": [{
Expand Down
3 changes: 2 additions & 1 deletion charts/opentelemetry-operator/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,8 @@ manager:
serviceAccount:
create: true
annotations: {}
# name: nameOverride
## Override the default name of the serviceaccount (the name of your installation)
name: ""

## Enable ServiceMonitor for Prometheus metrics scrape
serviceMonitor:
Expand Down

0 comments on commit 3b82d8f

Please sign in to comment.