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.

Sign up for GitHub

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[opentelemetry-kube-stack] cleanupJob add support custom image and registry #1486

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat[opentelemetry-kube-stack] cleanupJob add support custom image and registry #1486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion charts/opentelemetry-kube-stack/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v2
name: opentelemetry-kube-stack
version: 0.3.9
version: 0.3.10
description: |
OpenTelemetry Quickstart chart for Kubernetes.
Installs an operator and collector for an easy way to get started with Kubernetes observability.
Expand Down
2 changes: 1 addition & 1 deletion charts/opentelemetry-kube-stack/examples/cloud-demo/rendered/bridge.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ kind: OpAMPBridge
metadata:
name: example
labels:
helm.sh/chart: opentelemetry-kube-stack-0.3.9
helm.sh/chart: opentelemetry-kube-stack-0.3.10
app.kubernetes.io/version: "0.107.0"
app.kubernetes.io/managed-by: Helm
release: "example"
Expand Down
4 changes: 2 additions & 2 deletions charts/opentelemetry-kube-stack/examples/cloud-demo/rendered/collector.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-cluster-stats
namespace: default
labels:
helm.sh/chart: opentelemetry-kube-stack-0.3.9
helm.sh/chart: opentelemetry-kube-stack-0.3.10
app.kubernetes.io/version: "0.107.0"
app.kubernetes.io/managed-by: Helm
release: "example"
Expand Down Expand Up @@ -187,7 +187,7 @@ metadata:
name: example-daemon
namespace: default
labels:
helm.sh/chart: opentelemetry-kube-stack-0.3.9
helm.sh/chart: opentelemetry-kube-stack-0.3.10
app.kubernetes.io/version: "0.107.0"
app.kubernetes.io/managed-by: Helm
release: "example"
Expand Down
4 changes: 2 additions & 2 deletions charts/opentelemetry-kube-stack/examples/cloud-demo/rendered/hooks.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@ spec:
serviceAccountName: delete-resources-sa
containers:
- name: delete-resources
image: bitnami/kubectl:latest
image: "bitnami/kubectl:latest"
command:
- /bin/sh
- -c
- |
kubectl delete instrumentations,opampbridges,opentelemetrycollectors \
-l helm.sh/chart=opentelemetry-kube-stack-0.3.9
-l helm.sh/chart=opentelemetry-kube-stack-0.3.10
2 changes: 1 addition & 1 deletion charts/opentelemetry-kube-stack/examples/cloud-demo/rendered/instrumentation.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ kind: Instrumentation
metadata:
name: example
labels:
helm.sh/chart: opentelemetry-kube-stack-0.3.9
helm.sh/chart: opentelemetry-kube-stack-0.3.10
app.kubernetes.io/version: "0.107.0"
app.kubernetes.io/managed-by: Helm
release: "example"
Expand Down
2 changes: 1 addition & 1 deletion charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/collector.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-daemon
namespace: default
labels:
helm.sh/chart: opentelemetry-kube-stack-0.3.9
helm.sh/chart: opentelemetry-kube-stack-0.3.10
app.kubernetes.io/version: "0.107.0"
app.kubernetes.io/managed-by: Helm
release: "example"
Expand Down
2 changes: 1 addition & 1 deletion ...ube-stack/examples/prometheus-otel/rendered/exporters/kube-api-server/servicemonitor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
namespace: default
labels:
app: opentelemetry-kube-stack-apiserver
helm.sh/chart: opentelemetry-kube-stack-0.3.9
helm.sh/chart: opentelemetry-kube-stack-0.3.10
app.kubernetes.io/version: "0.107.0"
app.kubernetes.io/managed-by: Helm
release: "example"
Expand Down
2 changes: 1 addition & 1 deletion ...be-stack/examples/prometheus-otel/rendered/exporters/kube-controller-manager/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
labels:
app: opentelemetry-kube-stack-kube-controller-manager
jobLabel: kube-controller-manager
helm.sh/chart: opentelemetry-kube-stack-0.3.9
helm.sh/chart: opentelemetry-kube-stack-0.3.10
app.kubernetes.io/version: "0.107.0"
app.kubernetes.io/managed-by: Helm
release: "example"
Expand Down
2 changes: 1 addition & 1 deletion ...k/examples/prometheus-otel/rendered/exporters/kube-controller-manager/servicemonitor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
namespace: default
labels:
app: opentelemetry-kube-stack-kube-controller-manager
helm.sh/chart: opentelemetry-kube-stack-0.3.9
helm.sh/chart: opentelemetry-kube-stack-0.3.10
app.kubernetes.io/version: "0.107.0"
app.kubernetes.io/managed-by: Helm
release: "example"
Expand Down
2 changes: 1 addition & 1 deletion ...pentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-dns/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
labels:
app: opentelemetry-kube-stack-kube-dns
jobLabel: kube-dns
helm.sh/chart: opentelemetry-kube-stack-0.3.9
helm.sh/chart: opentelemetry-kube-stack-0.3.10
app.kubernetes.io/version: "0.107.0"
app.kubernetes.io/managed-by: Helm
release: "example"
Expand Down
2 changes: 1 addition & 1 deletion ...metry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-dns/servicemonitor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
namespace: default
labels:
app: opentelemetry-kube-stack-kube-dns
helm.sh/chart: opentelemetry-kube-stack-0.3.9
helm.sh/chart: opentelemetry-kube-stack-0.3.10
app.kubernetes.io/version: "0.107.0"
app.kubernetes.io/managed-by: Helm
release: "example"
Expand Down
2 changes: 1 addition & 1 deletion ...entelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-etcd/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
labels:
app: opentelemetry-kube-stack-kube-etcd
jobLabel: kube-etcd
helm.sh/chart: opentelemetry-kube-stack-0.3.9
helm.sh/chart: opentelemetry-kube-stack-0.3.10
app.kubernetes.io/version: "0.107.0"
app.kubernetes.io/managed-by: Helm
release: "example"
Expand Down
2 changes: 1 addition & 1 deletion ...etry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-etcd/servicemonitor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
namespace: default
labels:
app: opentelemetry-kube-stack-kube-etcd
helm.sh/chart: opentelemetry-kube-stack-0.3.9
helm.sh/chart: opentelemetry-kube-stack-0.3.10
app.kubernetes.io/version: "0.107.0"
app.kubernetes.io/managed-by: Helm
release: "example"
Expand Down
2 changes: 1 addition & 1 deletion ...ntelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-proxy/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
labels:
app: opentelemetry-kube-stack-kube-proxy
jobLabel: kube-proxy
helm.sh/chart: opentelemetry-kube-stack-0.3.9
helm.sh/chart: opentelemetry-kube-stack-0.3.10
app.kubernetes.io/version: "0.107.0"
app.kubernetes.io/managed-by: Helm
release: "example"
Expand Down
2 changes: 1 addition & 1 deletion ...try-kube-stack/examples/prometheus-otel/rendered/exporters/kube-proxy/servicemonitor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
namespace: default
labels:
app: opentelemetry-kube-stack-kube-proxy
helm.sh/chart: opentelemetry-kube-stack-0.3.9
helm.sh/chart: opentelemetry-kube-stack-0.3.10
app.kubernetes.io/version: "0.107.0"
app.kubernetes.io/managed-by: Helm
release: "example"
Expand Down
2 changes: 1 addition & 1 deletion ...emetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-scheduler/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
labels:
app: opentelemetry-kube-stack-kube-scheduler
jobLabel: kube-scheduler
helm.sh/chart: opentelemetry-kube-stack-0.3.9
helm.sh/chart: opentelemetry-kube-stack-0.3.10
app.kubernetes.io/version: "0.107.0"
app.kubernetes.io/managed-by: Helm
release: "example"
Expand Down
2 changes: 1 addition & 1 deletion ...kube-stack/examples/prometheus-otel/rendered/exporters/kube-scheduler/servicemonitor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
namespace: default
labels:
app: opentelemetry-kube-stack-kube-scheduler
helm.sh/chart: opentelemetry-kube-stack-0.3.9
helm.sh/chart: opentelemetry-kube-stack-0.3.10
app.kubernetes.io/version: "0.107.0"
app.kubernetes.io/managed-by: Helm
release: "example"
Expand Down
4 changes: 2 additions & 2 deletions charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/hooks.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@ spec:
serviceAccountName: delete-resources-sa
containers:
- name: delete-resources
image: bitnami/kubectl:latest
image: "bitnami/kubectl:latest"
command:
- /bin/sh
- -c
- |
kubectl delete instrumentations,opampbridges,opentelemetrycollectors \
-l helm.sh/chart=opentelemetry-kube-stack-0.3.9
-l helm.sh/chart=opentelemetry-kube-stack-0.3.10
6 changes: 5 additions & 1 deletion charts/opentelemetry-kube-stack/templates/hooks.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,11 @@ spec:
serviceAccountName: delete-resources-sa
containers:
- name: delete-resources
image: bitnami/kubectl:latest
{{- if $.Values.cleanupJob.image.digest }}
image: "{{ $.Values.cleanupJob.image.repository }}@{{ $.Values.cleanupJob.image.digest }}"
{{- else }}
image: "{{ $.Values.cleanupJob.image.repository }}:{{ $.Values.cleanupJob.image.tag }}"
{{- end }}
genadipost marked this conversation as resolved.
Show resolved Hide resolved
command:
- /bin/sh
- -c
Expand Down
6 changes: 6 additions & 0 deletions charts/opentelemetry-kube-stack/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@ cleanupJob:
# For non-helm installations i.e. ones created via helm template, it may make sense to disable this.
# For those installations, ensure that uninstallation for the operator happens _after_ the deletion of the CRs.
enabled: true
# Image details for the kubectl
image:
repository: bitnami/kubectl
tag: latest
# When digest is set to a non-empty value, images will be pulled by digest (regardless of tag value).
digest: ""

# Should the CRDs be installed by this chart.
crds:
Expand Down
Loading