Skip to content

Commit

Permalink
Update operator subchart to at least v0.56.0
Browse files Browse the repository at this point in the history
  • Loading branch information
jvoravong committed Sep 12, 2024
1 parent 13281f4 commit 08c46fe
Show file tree
Hide file tree
Showing 13 changed files with 71 additions and 40 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@ metadata:
annotations:
cert-manager.io/inject-ca-from: default/default-operator-serving-cert
labels:
helm.sh/chart: operator-0.49.1
helm.sh/chart: operator-0.56.0
app.kubernetes.io/name: operator
app.kubernetes.io/version: "0.95.0"
app.kubernetes.io/version: "0.98.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default

app.kubernetes.io/component: webhook
name: default-operator-mutation
webhooks:
Expand Down Expand Up @@ -77,7 +78,6 @@ webhooks:
- v1
operations:
- CREATE
- UPDATE
resources:
- pods
scope: Namespaced
Expand All @@ -91,11 +91,12 @@ metadata:
annotations:
cert-manager.io/inject-ca-from: default/default-operator-serving-cert
labels:
helm.sh/chart: operator-0.49.1
helm.sh/chart: operator-0.56.0
app.kubernetes.io/name: operator
app.kubernetes.io/version: "0.95.0"
app.kubernetes.io/version: "0.98.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default

app.kubernetes.io/component: webhook
name: default-operator-validation
webhooks:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,12 @@ metadata:
helm.sh/hook: post-install,post-upgrade
helm.sh/hook-weight: "1"
labels:
helm.sh/chart: operator-0.49.1
helm.sh/chart: operator-0.56.0
app.kubernetes.io/name: operator
app.kubernetes.io/version: "0.95.0"
app.kubernetes.io/version: "0.98.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default

app.kubernetes.io/component: webhook
name: default-operator-serving-cert
namespace: default
Expand All @@ -35,11 +36,12 @@ metadata:
helm.sh/hook: post-install,post-upgrade
helm.sh/hook-weight: "1"
labels:
helm.sh/chart: operator-0.49.1
helm.sh/chart: operator-0.56.0
app.kubernetes.io/name: operator
app.kubernetes.io/version: "0.95.0"
app.kubernetes.io/version: "0.98.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default

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

app.kubernetes.io/component: controller-manager
name: default-operator-manager
rules:
Expand Down Expand Up @@ -59,6 +60,7 @@ rules:
- watch
- apiGroups:
- apps
- extensions
resources:
- replicasets
verbs:
Expand All @@ -77,6 +79,14 @@ rules:
- patch
- update
- watch
- apiGroups:
- batch
resources:
- jobs
verbs:
- get
- list
- watch
- apiGroups:
- config.openshift.io
resources:
Expand Down Expand Up @@ -213,11 +223,12 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
labels:
helm.sh/chart: operator-0.49.1
helm.sh/chart: operator-0.56.0
app.kubernetes.io/name: operator
app.kubernetes.io/version: "0.95.0"
app.kubernetes.io/version: "0.98.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default

app.kubernetes.io/component: controller-manager
name: default-operator-metrics
rules:
Expand All @@ -231,11 +242,12 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
labels:
helm.sh/chart: operator-0.49.1
helm.sh/chart: operator-0.56.0
app.kubernetes.io/name: operator
app.kubernetes.io/version: "0.95.0"
app.kubernetes.io/version: "0.98.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default

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

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

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

app.kubernetes.io/component: controller-manager
name: default-operator
namespace: default
Expand All @@ -33,13 +34,13 @@ spec:
- --enable-leader-election
- --health-probe-addr=:8081
- --webhook-port=9443
- --collector-image=otel/opentelemetry-collector-contrib:0.95.0
- --collector-image=quay.io/signalfx/splunk-otel-collector:0.98.0
command:
- /manager
env:
- name: ENABLE_WEBHOOKS
value: "true"
image: "ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:0.95.0"
image: "ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:0.98.0"
name: manager
ports:
- containerPort: 8080
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
labels:
helm.sh/chart: operator-0.49.1
helm.sh/chart: operator-0.56.0
app.kubernetes.io/name: operator
app.kubernetes.io/version: "0.95.0"
app.kubernetes.io/version: "0.98.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default

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

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

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

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

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

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,11 +6,12 @@ metadata:
name: "default-operator-metrics"
namespace: default
labels:
helm.sh/chart: operator-0.49.1
helm.sh/chart: operator-0.56.0
app.kubernetes.io/name: operator
app.kubernetes.io/version: "0.95.0"
app.kubernetes.io/version: "0.98.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: default

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

app.kubernetes.io/component: controller-manager
annotations:
"helm.sh/hook": test
Expand Down
2 changes: 1 addition & 1 deletion helm-charts/splunk-otel-collector/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ dependencies:
repository: https://charts.jetstack.io
condition: certmanager.enabled
- name: opentelemetry-operator
version: 0.49.1
version: 0.56.0
alias: operator
repository: https://open-telemetry.github.io/opentelemetry-helm-charts
condition: operator.enabled
5 changes: 5 additions & 0 deletions helm-charts/splunk-otel-collector/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1175,6 +1175,11 @@ operator:
issuerAnnotations:
"helm.sh/hook": post-install,post-upgrade
"helm.sh/hook-weight": "1"
# Collector deployment via the operator is not supported at this time.
# The collector image repository is specified here to meet operator subchart constraints.
manager:
collectorImage:
repository: quay.io/signalfx/splunk-otel-collector

# The default Splunk Instrumentation object deployed when operator.enabled=true.
# For more details see:
Expand Down

0 comments on commit 08c46fe

Please sign in to comment.