diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/clusterrole.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/clusterrole.yaml index 41ad3ca81..37dd3e814 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/clusterrole.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/clusterrole.yaml @@ -4,10 +4,10 @@ kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm name: example-grafana-clusterrole rules: [] diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/clusterrolebinding.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/clusterrolebinding.yaml index b29ae8821..1bb386013 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/clusterrolebinding.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/clusterrolebinding.yaml @@ -5,10 +5,10 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: example-grafana-clusterrolebinding labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm subjects: - kind: ServiceAccount diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/configmap.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/configmap.yaml index 1be423a56..d85c20ab6 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/configmap.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/configmap.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm data: grafana.ini: | diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/deployment.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/deployment.yaml index b65d0eb83..703abeec6 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/deployment.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/deployment.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm spec: replicas: 1 @@ -26,11 +26,10 @@ spec: app.kubernetes.io/name: grafana app.kubernetes.io/instance: example annotations: - checksum/config: faa523acbb15ce366dd2353d5417b71479ace592c9694e315997add86f6592bc + checksum/config: 0bd174d19e5d455ad71aea624e65ae51fd412a6b3c54fba8db25d85a897c0f1b checksum/dashboards-json-config: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b checksum/sc-dashboard-provider-config: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b - checksum/secret: a5b2dd94ad3d3c38ad2f31d52e0b0588f2df6263a230726d9f6673b8b23105da - kubectl.kubernetes.io/default-container: grafana + checksum/secret: 159754aaf8e3f63d0512321d2f4ec32957e240bc75210d5e24303e6d266666b4 spec: serviceAccountName: example-grafana @@ -38,20 +37,12 @@ spec: securityContext: fsGroup: 472 runAsGroup: 472 - runAsNonRoot: true runAsUser: 472 enableServiceLinks: true containers: - name: grafana - image: "docker.io/grafana/grafana:10.0.3" + image: "grafana/grafana:9.4.7" imagePullPolicy: IfNotPresent - securityContext: - allowPrivilegeEscalation: false - capabilities: - drop: - - ALL - seccompProfile: - type: RuntimeDefault volumeMounts: - name: config mountPath: "/etc/grafana/grafana.ini" diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/role.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/role.yaml index 4bb6ab1b9..ffe05e274 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/role.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/role.yaml @@ -6,9 +6,9 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm rules: [] diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/rolebinding.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/rolebinding.yaml index 3fb842746..2ff6b3d95 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/rolebinding.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/rolebinding.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/secret.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/secret.yaml index 5945da59c..8ca5ebfc6 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/secret.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/secret.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm type: Opaque data: diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/service.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/service.yaml index 397a3d56c..20e30b774 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/service.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/service.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm spec: type: ClusterIP diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/serviceaccount.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/serviceaccount.yaml index 7bdd349a1..2d4090b96 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/serviceaccount.yaml @@ -4,10 +4,10 @@ apiVersion: v1 kind: ServiceAccount metadata: labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm name: example-grafana namespace: default diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/tests/test-configmap.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/tests/test-configmap.yaml index 22511fc1f..783067d38 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/tests/test-configmap.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/tests/test-configmap.yaml @@ -9,10 +9,10 @@ metadata: "helm.sh/hook": test-success "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded" labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm data: run.sh: |- diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/tests/test-serviceaccount.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/tests/test-serviceaccount.yaml index 9cf86f6c9..5b43f7194 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/tests/test-serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/tests/test-serviceaccount.yaml @@ -4,10 +4,10 @@ apiVersion: v1 kind: ServiceAccount metadata: labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm name: example-grafana-test namespace: default diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/tests/test.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/tests/test.yaml index ae03b9581..27a0e8224 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/tests/test.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana/tests/test.yaml @@ -5,10 +5,10 @@ kind: Pod metadata: name: example-grafana-test labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm annotations: "helm.sh/hook": test-success @@ -18,7 +18,7 @@ spec: serviceAccountName: example-grafana-test containers: - name: example-test - image: "docker.io/bats/bats:v1.4.1" + image: "bats/bats:v1.4.1" imagePullPolicy: "IfNotPresent" command: ["/opt/bats/bin/bats", "-t", "/tests/run.sh"] volumeMounts: diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-agent-svc.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-agent-svc.yaml index 19d9ec47c..13c4b0a18 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-agent-svc.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-agent-svc.yaml @@ -5,10 +5,10 @@ kind: Service metadata: name: example-jaeger-agent labels: - helm.sh/chart: jaeger-0.71.11 + helm.sh/chart: jaeger-0.69.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example - app.kubernetes.io/version: "1.45.0" + app.kubernetes.io/version: "1.42.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: service-agent spec: diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-collector-svc.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-collector-svc.yaml index 1232c2f82..8786c0e7b 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-collector-svc.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-collector-svc.yaml @@ -5,10 +5,10 @@ kind: Service metadata: name: example-jaeger-collector labels: - helm.sh/chart: jaeger-0.71.11 + helm.sh/chart: jaeger-0.69.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example - app.kubernetes.io/version: "1.45.0" + app.kubernetes.io/version: "1.42.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: service-collector spec: diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-deploy.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-deploy.yaml index d492c2124..4518b9fe4 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-deploy.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-deploy.yaml @@ -5,10 +5,10 @@ kind: Deployment metadata: name: example-jaeger labels: - helm.sh/chart: jaeger-0.71.11 + helm.sh/chart: jaeger-0.69.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example - app.kubernetes.io/version: "1.45.0" + app.kubernetes.io/version: "1.42.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: all-in-one prometheus.io/port: "14269" @@ -44,7 +44,7 @@ spec: value: "false" - name: COLLECTOR_OTLP_ENABLED value: "true" - image: jaegertracing/all-in-one:1.45.0 + image: jaegertracing/all-in-one:1.42.0 imagePullPolicy: IfNotPresent name: jaeger args: @@ -96,6 +96,4 @@ spec: resources: limits: memory: 300Mi - volumeMounts: serviceAccountName: example-jaeger - volumes: diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-query-svc.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-query-svc.yaml index 032bee30f..da5bade96 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-query-svc.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-query-svc.yaml @@ -5,10 +5,10 @@ kind: Service metadata: name: example-jaeger-query labels: - helm.sh/chart: jaeger-0.71.11 + helm.sh/chart: jaeger-0.69.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example - app.kubernetes.io/version: "1.45.0" + app.kubernetes.io/version: "1.42.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: service-query spec: diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-sa.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-sa.yaml index fa14f6868..a5ae7bb57 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-sa.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/jaeger/allinone-sa.yaml @@ -5,9 +5,9 @@ kind: ServiceAccount metadata: name: example-jaeger labels: - helm.sh/chart: jaeger-0.71.11 + helm.sh/chart: jaeger-0.69.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example - app.kubernetes.io/version: "1.45.0" + app.kubernetes.io/version: "1.42.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: all-in-one diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/configmap-agent.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/configmap-agent.yaml index a6e36ebb5..0d4759de1 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/configmap-agent.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/configmap-agent.yaml @@ -5,10 +5,10 @@ kind: ConfigMap metadata: name: example-otelcol-agent labels: - helm.sh/chart: opentelemetry-collector-0.65.1 + helm.sh/chart: opentelemetry-collector-0.57.2 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.82.0" + app.kubernetes.io/version: "0.77.0" app.kubernetes.io/managed-by: Helm data: relay: | diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/daemonset.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/daemonset.yaml index 6f60463bd..c784ea87f 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/daemonset.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/daemonset.yaml @@ -5,10 +5,10 @@ kind: DaemonSet metadata: name: example-otelcol-agent labels: - helm.sh/chart: opentelemetry-collector-0.65.1 + helm.sh/chart: opentelemetry-collector-0.57.2 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.82.0" + app.kubernetes.io/version: "0.77.0" app.kubernetes.io/managed-by: Helm spec: selector: @@ -21,7 +21,7 @@ spec: template: metadata: annotations: - checksum/config: e62fcdf5b3a33ec3cdb0ad02e110fcaa5f3ec9f29067a643b7413b0bd7623171 + checksum/config: 19f2931042e627b07e3bf0e0b69778e9bcb40885393993fb6b7e8acebdc5c357 opentelemetry_community_demo: "true" prometheus.io/port: "9464" prometheus.io/scrape: "true" @@ -42,7 +42,7 @@ spec: - --config=/conf/relay.yaml securityContext: {} - image: "otel/opentelemetry-collector-contrib:0.82.0" + image: "otel/opentelemetry-collector-contrib:0.77.0" imagePullPolicy: IfNotPresent ports: - name: jaeger-compact diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/serviceaccount.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/serviceaccount.yaml index 5601241bf..0b75edfb5 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/opentelemetry-collector/serviceaccount.yaml @@ -5,8 +5,8 @@ kind: ServiceAccount metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.65.1 + helm.sh/chart: opentelemetry-collector-0.57.2 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.82.0" + app.kubernetes.io/version: "0.77.0" app.kubernetes.io/managed-by: Helm diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/clusterrole.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/clusterrole.yaml index dc9341909..f33254581 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/clusterrole.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/clusterrole.yaml @@ -4,13 +4,11 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: - app.kubernetes.io/component: server - app.kubernetes.io/name: prometheus - app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.46.0 - helm.sh/chart: prometheus-23.3.0 - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/part-of: prometheus + component: "server" + app: prometheus + release: example + chart: prometheus-20.2.0 + heritage: Helm name: example-prometheus-server rules: - apiGroups: diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/clusterrolebinding.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/clusterrolebinding.yaml index 5b48ce6a0..114cb7979 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/clusterrolebinding.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/clusterrolebinding.yaml @@ -4,13 +4,11 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: labels: - app.kubernetes.io/component: server - app.kubernetes.io/name: prometheus - app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.46.0 - helm.sh/chart: prometheus-23.3.0 - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/part-of: prometheus + component: "server" + app: prometheus + release: example + chart: prometheus-20.2.0 + heritage: Helm name: example-prometheus-server subjects: - kind: ServiceAccount diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/cm.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/cm.yaml index a1d733410..149a9bebf 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/cm.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/cm.yaml @@ -4,13 +4,11 @@ apiVersion: v1 kind: ConfigMap metadata: labels: - app.kubernetes.io/component: server - app.kubernetes.io/name: prometheus - app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.46.0 - helm.sh/chart: prometheus-23.3.0 - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/part-of: prometheus + component: "server" + app: prometheus + release: example + chart: prometheus-20.2.0 + heritage: Helm name: example-prometheus-server namespace: default data: diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/deploy.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/deploy.yaml index cbf307609..b5578f03b 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/deploy.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/deploy.yaml @@ -4,43 +4,38 @@ apiVersion: apps/v1 kind: Deployment metadata: labels: - app.kubernetes.io/component: server - app.kubernetes.io/name: prometheus - app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.46.0 - helm.sh/chart: prometheus-23.3.0 - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/part-of: prometheus + component: "server" + app: prometheus + release: example + chart: prometheus-20.2.0 + heritage: Helm name: example-prometheus-server namespace: default spec: selector: matchLabels: - app.kubernetes.io/component: server - app.kubernetes.io/name: prometheus - app.kubernetes.io/instance: example + component: "server" + app: prometheus + release: example replicas: 1 - revisionHistoryLimit: 10 strategy: type: Recreate rollingUpdate: null template: metadata: labels: - app.kubernetes.io/component: server - app.kubernetes.io/name: prometheus - app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.46.0 - helm.sh/chart: prometheus-23.3.0 - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/part-of: prometheus + component: "server" + app: prometheus + release: example + chart: prometheus-20.2.0 + heritage: Helm spec: enableServiceLinks: true serviceAccountName: example-prometheus-server containers: - name: prometheus-server - image: "quay.io/prometheus/prometheus:v2.46.0" + image: "quay.io/prometheus/prometheus:v2.43.0" imagePullPolicy: "IfNotPresent" args: - --storage.tsdb.retention.time=15d diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/service.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/service.yaml index e184e9f0d..8e4cc196d 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/service.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/service.yaml @@ -4,13 +4,11 @@ apiVersion: v1 kind: Service metadata: labels: - app.kubernetes.io/component: server - app.kubernetes.io/name: prometheus - app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.46.0 - helm.sh/chart: prometheus-23.3.0 - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/part-of: prometheus + component: "server" + app: prometheus + release: example + chart: prometheus-20.2.0 + heritage: Helm name: example-prometheus-server namespace: default spec: @@ -20,8 +18,8 @@ spec: protocol: TCP targetPort: 9090 selector: - app.kubernetes.io/component: server - app.kubernetes.io/name: prometheus - app.kubernetes.io/instance: example + component: "server" + app: prometheus + release: example sessionAffinity: None type: "ClusterIP" diff --git a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/serviceaccount.yaml b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/serviceaccount.yaml index 1ebd2db1e..c9d51410f 100644 --- a/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/prometheus/serviceaccount.yaml @@ -4,13 +4,11 @@ apiVersion: v1 kind: ServiceAccount metadata: labels: - app.kubernetes.io/component: server - app.kubernetes.io/name: prometheus - app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.46.0 - helm.sh/chart: prometheus-23.3.0 - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/part-of: prometheus + component: "server" + app: prometheus + release: example + chart: prometheus-20.2.0 + heritage: Helm name: example-prometheus-server namespace: default annotations: diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/clusterrole.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/clusterrole.yaml index 41ad3ca81..37dd3e814 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/clusterrole.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/clusterrole.yaml @@ -4,10 +4,10 @@ kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm name: example-grafana-clusterrole rules: [] diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/clusterrolebinding.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/clusterrolebinding.yaml index b29ae8821..1bb386013 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/clusterrolebinding.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/clusterrolebinding.yaml @@ -5,10 +5,10 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: example-grafana-clusterrolebinding labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm subjects: - kind: ServiceAccount diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/configmap.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/configmap.yaml index 1be423a56..d85c20ab6 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/configmap.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/configmap.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm data: grafana.ini: | diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/deployment.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/deployment.yaml index b65d0eb83..703abeec6 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/deployment.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/deployment.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm spec: replicas: 1 @@ -26,11 +26,10 @@ spec: app.kubernetes.io/name: grafana app.kubernetes.io/instance: example annotations: - checksum/config: faa523acbb15ce366dd2353d5417b71479ace592c9694e315997add86f6592bc + checksum/config: 0bd174d19e5d455ad71aea624e65ae51fd412a6b3c54fba8db25d85a897c0f1b checksum/dashboards-json-config: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b checksum/sc-dashboard-provider-config: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b - checksum/secret: a5b2dd94ad3d3c38ad2f31d52e0b0588f2df6263a230726d9f6673b8b23105da - kubectl.kubernetes.io/default-container: grafana + checksum/secret: 159754aaf8e3f63d0512321d2f4ec32957e240bc75210d5e24303e6d266666b4 spec: serviceAccountName: example-grafana @@ -38,20 +37,12 @@ spec: securityContext: fsGroup: 472 runAsGroup: 472 - runAsNonRoot: true runAsUser: 472 enableServiceLinks: true containers: - name: grafana - image: "docker.io/grafana/grafana:10.0.3" + image: "grafana/grafana:9.4.7" imagePullPolicy: IfNotPresent - securityContext: - allowPrivilegeEscalation: false - capabilities: - drop: - - ALL - seccompProfile: - type: RuntimeDefault volumeMounts: - name: config mountPath: "/etc/grafana/grafana.ini" diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/role.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/role.yaml index 4bb6ab1b9..ffe05e274 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/role.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/role.yaml @@ -6,9 +6,9 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm rules: [] diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/rolebinding.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/rolebinding.yaml index 3fb842746..2ff6b3d95 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/rolebinding.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/rolebinding.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/secret.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/secret.yaml index 5945da59c..8ca5ebfc6 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/secret.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/secret.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm type: Opaque data: diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/service.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/service.yaml index 397a3d56c..20e30b774 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/service.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/service.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm spec: type: ClusterIP diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/serviceaccount.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/serviceaccount.yaml index 7bdd349a1..2d4090b96 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/serviceaccount.yaml @@ -4,10 +4,10 @@ apiVersion: v1 kind: ServiceAccount metadata: labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm name: example-grafana namespace: default diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/tests/test-configmap.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/tests/test-configmap.yaml index 22511fc1f..783067d38 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/tests/test-configmap.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/tests/test-configmap.yaml @@ -9,10 +9,10 @@ metadata: "helm.sh/hook": test-success "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded" labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm data: run.sh: |- diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/tests/test-serviceaccount.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/tests/test-serviceaccount.yaml index 9cf86f6c9..5b43f7194 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/tests/test-serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/tests/test-serviceaccount.yaml @@ -4,10 +4,10 @@ apiVersion: v1 kind: ServiceAccount metadata: labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm name: example-grafana-test namespace: default diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/tests/test.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/tests/test.yaml index ae03b9581..27a0e8224 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/tests/test.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana/tests/test.yaml @@ -5,10 +5,10 @@ kind: Pod metadata: name: example-grafana-test labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm annotations: "helm.sh/hook": test-success @@ -18,7 +18,7 @@ spec: serviceAccountName: example-grafana-test containers: - name: example-test - image: "docker.io/bats/bats:v1.4.1" + image: "bats/bats:v1.4.1" imagePullPolicy: "IfNotPresent" command: ["/opt/bats/bin/bats", "-t", "/tests/run.sh"] volumeMounts: diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-agent-svc.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-agent-svc.yaml index 19d9ec47c..13c4b0a18 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-agent-svc.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-agent-svc.yaml @@ -5,10 +5,10 @@ kind: Service metadata: name: example-jaeger-agent labels: - helm.sh/chart: jaeger-0.71.11 + helm.sh/chart: jaeger-0.69.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example - app.kubernetes.io/version: "1.45.0" + app.kubernetes.io/version: "1.42.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: service-agent spec: diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-collector-svc.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-collector-svc.yaml index 1232c2f82..8786c0e7b 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-collector-svc.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-collector-svc.yaml @@ -5,10 +5,10 @@ kind: Service metadata: name: example-jaeger-collector labels: - helm.sh/chart: jaeger-0.71.11 + helm.sh/chart: jaeger-0.69.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example - app.kubernetes.io/version: "1.45.0" + app.kubernetes.io/version: "1.42.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: service-collector spec: diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-deploy.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-deploy.yaml index d492c2124..4518b9fe4 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-deploy.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-deploy.yaml @@ -5,10 +5,10 @@ kind: Deployment metadata: name: example-jaeger labels: - helm.sh/chart: jaeger-0.71.11 + helm.sh/chart: jaeger-0.69.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example - app.kubernetes.io/version: "1.45.0" + app.kubernetes.io/version: "1.42.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: all-in-one prometheus.io/port: "14269" @@ -44,7 +44,7 @@ spec: value: "false" - name: COLLECTOR_OTLP_ENABLED value: "true" - image: jaegertracing/all-in-one:1.45.0 + image: jaegertracing/all-in-one:1.42.0 imagePullPolicy: IfNotPresent name: jaeger args: @@ -96,6 +96,4 @@ spec: resources: limits: memory: 300Mi - volumeMounts: serviceAccountName: example-jaeger - volumes: diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-query-svc.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-query-svc.yaml index 032bee30f..da5bade96 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-query-svc.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-query-svc.yaml @@ -5,10 +5,10 @@ kind: Service metadata: name: example-jaeger-query labels: - helm.sh/chart: jaeger-0.71.11 + helm.sh/chart: jaeger-0.69.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example - app.kubernetes.io/version: "1.45.0" + app.kubernetes.io/version: "1.42.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: service-query spec: diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-sa.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-sa.yaml index fa14f6868..a5ae7bb57 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-sa.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/jaeger/allinone-sa.yaml @@ -5,9 +5,9 @@ kind: ServiceAccount metadata: name: example-jaeger labels: - helm.sh/chart: jaeger-0.71.11 + helm.sh/chart: jaeger-0.69.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example - app.kubernetes.io/version: "1.45.0" + app.kubernetes.io/version: "1.42.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: all-in-one diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/configmap.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/configmap.yaml index f201a599a..e11c3b0cf 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/configmap.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/configmap.yaml @@ -5,10 +5,10 @@ kind: ConfigMap metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.65.1 + helm.sh/chart: opentelemetry-collector-0.57.2 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.82.0" + app.kubernetes.io/version: "0.77.0" app.kubernetes.io/managed-by: Helm data: relay: | diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/deployment.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/deployment.yaml index 6480aa00d..a3c34ed9a 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/deployment.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/deployment.yaml @@ -5,10 +5,10 @@ kind: Deployment metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.65.1 + helm.sh/chart: opentelemetry-collector-0.57.2 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.82.0" + app.kubernetes.io/version: "0.77.0" app.kubernetes.io/managed-by: Helm spec: replicas: 1 @@ -23,7 +23,7 @@ spec: template: metadata: annotations: - checksum/config: 20851ed0c4bdafbefc52a90b489ba1a5a377b40e2add9425e2e4de2dcfce0f2d + checksum/config: f85af59ffecbb732ad2cb7dddd076c5820e389485040b4cdedf8ad9e9cbe49b2 opentelemetry_community_demo: "true" prometheus.io/port: "9464" prometheus.io/scrape: "true" @@ -44,7 +44,7 @@ spec: - --config=/conf/relay.yaml securityContext: {} - image: "otel/opentelemetry-collector-contrib:0.82.0" + image: "otel/opentelemetry-collector-contrib:0.77.0" imagePullPolicy: IfNotPresent ports: - name: jaeger-compact diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/service.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/service.yaml index d431f6ea5..5247e48b6 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/service.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/service.yaml @@ -5,10 +5,10 @@ kind: Service metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.65.1 + helm.sh/chart: opentelemetry-collector-0.57.2 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.82.0" + app.kubernetes.io/version: "0.77.0" app.kubernetes.io/managed-by: Helm component: standalone-collector spec: @@ -52,4 +52,3 @@ spec: app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example component: standalone-collector - internalTrafficPolicy: Cluster diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/serviceaccount.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/serviceaccount.yaml index 5601241bf..0b75edfb5 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/opentelemetry-collector/serviceaccount.yaml @@ -5,8 +5,8 @@ kind: ServiceAccount metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.65.1 + helm.sh/chart: opentelemetry-collector-0.57.2 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.82.0" + app.kubernetes.io/version: "0.77.0" app.kubernetes.io/managed-by: Helm diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/clusterrole.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/clusterrole.yaml index dc9341909..f33254581 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/clusterrole.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/clusterrole.yaml @@ -4,13 +4,11 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: - app.kubernetes.io/component: server - app.kubernetes.io/name: prometheus - app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.46.0 - helm.sh/chart: prometheus-23.3.0 - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/part-of: prometheus + component: "server" + app: prometheus + release: example + chart: prometheus-20.2.0 + heritage: Helm name: example-prometheus-server rules: - apiGroups: diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/clusterrolebinding.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/clusterrolebinding.yaml index 5b48ce6a0..114cb7979 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/clusterrolebinding.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/clusterrolebinding.yaml @@ -4,13 +4,11 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: labels: - app.kubernetes.io/component: server - app.kubernetes.io/name: prometheus - app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.46.0 - helm.sh/chart: prometheus-23.3.0 - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/part-of: prometheus + component: "server" + app: prometheus + release: example + chart: prometheus-20.2.0 + heritage: Helm name: example-prometheus-server subjects: - kind: ServiceAccount diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/cm.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/cm.yaml index a1d733410..149a9bebf 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/cm.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/cm.yaml @@ -4,13 +4,11 @@ apiVersion: v1 kind: ConfigMap metadata: labels: - app.kubernetes.io/component: server - app.kubernetes.io/name: prometheus - app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.46.0 - helm.sh/chart: prometheus-23.3.0 - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/part-of: prometheus + component: "server" + app: prometheus + release: example + chart: prometheus-20.2.0 + heritage: Helm name: example-prometheus-server namespace: default data: diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/deploy.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/deploy.yaml index cbf307609..b5578f03b 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/deploy.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/deploy.yaml @@ -4,43 +4,38 @@ apiVersion: apps/v1 kind: Deployment metadata: labels: - app.kubernetes.io/component: server - app.kubernetes.io/name: prometheus - app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.46.0 - helm.sh/chart: prometheus-23.3.0 - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/part-of: prometheus + component: "server" + app: prometheus + release: example + chart: prometheus-20.2.0 + heritage: Helm name: example-prometheus-server namespace: default spec: selector: matchLabels: - app.kubernetes.io/component: server - app.kubernetes.io/name: prometheus - app.kubernetes.io/instance: example + component: "server" + app: prometheus + release: example replicas: 1 - revisionHistoryLimit: 10 strategy: type: Recreate rollingUpdate: null template: metadata: labels: - app.kubernetes.io/component: server - app.kubernetes.io/name: prometheus - app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.46.0 - helm.sh/chart: prometheus-23.3.0 - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/part-of: prometheus + component: "server" + app: prometheus + release: example + chart: prometheus-20.2.0 + heritage: Helm spec: enableServiceLinks: true serviceAccountName: example-prometheus-server containers: - name: prometheus-server - image: "quay.io/prometheus/prometheus:v2.46.0" + image: "quay.io/prometheus/prometheus:v2.43.0" imagePullPolicy: "IfNotPresent" args: - --storage.tsdb.retention.time=15d diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/service.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/service.yaml index e184e9f0d..8e4cc196d 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/service.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/service.yaml @@ -4,13 +4,11 @@ apiVersion: v1 kind: Service metadata: labels: - app.kubernetes.io/component: server - app.kubernetes.io/name: prometheus - app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.46.0 - helm.sh/chart: prometheus-23.3.0 - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/part-of: prometheus + component: "server" + app: prometheus + release: example + chart: prometheus-20.2.0 + heritage: Helm name: example-prometheus-server namespace: default spec: @@ -20,8 +18,8 @@ spec: protocol: TCP targetPort: 9090 selector: - app.kubernetes.io/component: server - app.kubernetes.io/name: prometheus - app.kubernetes.io/instance: example + component: "server" + app: prometheus + release: example sessionAffinity: None type: "ClusterIP" diff --git a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/serviceaccount.yaml b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/serviceaccount.yaml index 1ebd2db1e..c9d51410f 100644 --- a/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/custom-environment-variables/rendered/prometheus/serviceaccount.yaml @@ -4,13 +4,11 @@ apiVersion: v1 kind: ServiceAccount metadata: labels: - app.kubernetes.io/component: server - app.kubernetes.io/name: prometheus - app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.46.0 - helm.sh/chart: prometheus-23.3.0 - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/part-of: prometheus + component: "server" + app: prometheus + release: example + chart: prometheus-20.2.0 + heritage: Helm name: example-prometheus-server namespace: default annotations: diff --git a/charts/opentelemetry-demo/examples/default/rendered/grafana/clusterrole.yaml b/charts/opentelemetry-demo/examples/default/rendered/grafana/clusterrole.yaml index 41ad3ca81..37dd3e814 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/grafana/clusterrole.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/grafana/clusterrole.yaml @@ -4,10 +4,10 @@ kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm name: example-grafana-clusterrole rules: [] diff --git a/charts/opentelemetry-demo/examples/default/rendered/grafana/clusterrolebinding.yaml b/charts/opentelemetry-demo/examples/default/rendered/grafana/clusterrolebinding.yaml index b29ae8821..1bb386013 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/grafana/clusterrolebinding.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/grafana/clusterrolebinding.yaml @@ -5,10 +5,10 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: example-grafana-clusterrolebinding labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm subjects: - kind: ServiceAccount diff --git a/charts/opentelemetry-demo/examples/default/rendered/grafana/configmap.yaml b/charts/opentelemetry-demo/examples/default/rendered/grafana/configmap.yaml index 1be423a56..d85c20ab6 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/grafana/configmap.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/grafana/configmap.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm data: grafana.ini: | diff --git a/charts/opentelemetry-demo/examples/default/rendered/grafana/deployment.yaml b/charts/opentelemetry-demo/examples/default/rendered/grafana/deployment.yaml index b65d0eb83..703abeec6 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/grafana/deployment.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/grafana/deployment.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm spec: replicas: 1 @@ -26,11 +26,10 @@ spec: app.kubernetes.io/name: grafana app.kubernetes.io/instance: example annotations: - checksum/config: faa523acbb15ce366dd2353d5417b71479ace592c9694e315997add86f6592bc + checksum/config: 0bd174d19e5d455ad71aea624e65ae51fd412a6b3c54fba8db25d85a897c0f1b checksum/dashboards-json-config: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b checksum/sc-dashboard-provider-config: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b - checksum/secret: a5b2dd94ad3d3c38ad2f31d52e0b0588f2df6263a230726d9f6673b8b23105da - kubectl.kubernetes.io/default-container: grafana + checksum/secret: 159754aaf8e3f63d0512321d2f4ec32957e240bc75210d5e24303e6d266666b4 spec: serviceAccountName: example-grafana @@ -38,20 +37,12 @@ spec: securityContext: fsGroup: 472 runAsGroup: 472 - runAsNonRoot: true runAsUser: 472 enableServiceLinks: true containers: - name: grafana - image: "docker.io/grafana/grafana:10.0.3" + image: "grafana/grafana:9.4.7" imagePullPolicy: IfNotPresent - securityContext: - allowPrivilegeEscalation: false - capabilities: - drop: - - ALL - seccompProfile: - type: RuntimeDefault volumeMounts: - name: config mountPath: "/etc/grafana/grafana.ini" diff --git a/charts/opentelemetry-demo/examples/default/rendered/grafana/role.yaml b/charts/opentelemetry-demo/examples/default/rendered/grafana/role.yaml index 4bb6ab1b9..ffe05e274 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/grafana/role.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/grafana/role.yaml @@ -6,9 +6,9 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm rules: [] diff --git a/charts/opentelemetry-demo/examples/default/rendered/grafana/rolebinding.yaml b/charts/opentelemetry-demo/examples/default/rendered/grafana/rolebinding.yaml index 3fb842746..2ff6b3d95 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/grafana/rolebinding.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/grafana/rolebinding.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/charts/opentelemetry-demo/examples/default/rendered/grafana/secret.yaml b/charts/opentelemetry-demo/examples/default/rendered/grafana/secret.yaml index 5945da59c..8ca5ebfc6 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/grafana/secret.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/grafana/secret.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm type: Opaque data: diff --git a/charts/opentelemetry-demo/examples/default/rendered/grafana/service.yaml b/charts/opentelemetry-demo/examples/default/rendered/grafana/service.yaml index 397a3d56c..20e30b774 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/grafana/service.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/grafana/service.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm spec: type: ClusterIP diff --git a/charts/opentelemetry-demo/examples/default/rendered/grafana/serviceaccount.yaml b/charts/opentelemetry-demo/examples/default/rendered/grafana/serviceaccount.yaml index 7bdd349a1..2d4090b96 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/grafana/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/grafana/serviceaccount.yaml @@ -4,10 +4,10 @@ apiVersion: v1 kind: ServiceAccount metadata: labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm name: example-grafana namespace: default diff --git a/charts/opentelemetry-demo/examples/default/rendered/grafana/tests/test-configmap.yaml b/charts/opentelemetry-demo/examples/default/rendered/grafana/tests/test-configmap.yaml index 22511fc1f..783067d38 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/grafana/tests/test-configmap.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/grafana/tests/test-configmap.yaml @@ -9,10 +9,10 @@ metadata: "helm.sh/hook": test-success "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded" labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm data: run.sh: |- diff --git a/charts/opentelemetry-demo/examples/default/rendered/grafana/tests/test-serviceaccount.yaml b/charts/opentelemetry-demo/examples/default/rendered/grafana/tests/test-serviceaccount.yaml index 9cf86f6c9..5b43f7194 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/grafana/tests/test-serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/grafana/tests/test-serviceaccount.yaml @@ -4,10 +4,10 @@ apiVersion: v1 kind: ServiceAccount metadata: labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm name: example-grafana-test namespace: default diff --git a/charts/opentelemetry-demo/examples/default/rendered/grafana/tests/test.yaml b/charts/opentelemetry-demo/examples/default/rendered/grafana/tests/test.yaml index ae03b9581..27a0e8224 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/grafana/tests/test.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/grafana/tests/test.yaml @@ -5,10 +5,10 @@ kind: Pod metadata: name: example-grafana-test labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm annotations: "helm.sh/hook": test-success @@ -18,7 +18,7 @@ spec: serviceAccountName: example-grafana-test containers: - name: example-test - image: "docker.io/bats/bats:v1.4.1" + image: "bats/bats:v1.4.1" imagePullPolicy: "IfNotPresent" command: ["/opt/bats/bin/bats", "-t", "/tests/run.sh"] volumeMounts: diff --git a/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-agent-svc.yaml b/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-agent-svc.yaml index 19d9ec47c..13c4b0a18 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-agent-svc.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-agent-svc.yaml @@ -5,10 +5,10 @@ kind: Service metadata: name: example-jaeger-agent labels: - helm.sh/chart: jaeger-0.71.11 + helm.sh/chart: jaeger-0.69.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example - app.kubernetes.io/version: "1.45.0" + app.kubernetes.io/version: "1.42.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: service-agent spec: diff --git a/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-collector-svc.yaml b/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-collector-svc.yaml index 1232c2f82..8786c0e7b 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-collector-svc.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-collector-svc.yaml @@ -5,10 +5,10 @@ kind: Service metadata: name: example-jaeger-collector labels: - helm.sh/chart: jaeger-0.71.11 + helm.sh/chart: jaeger-0.69.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example - app.kubernetes.io/version: "1.45.0" + app.kubernetes.io/version: "1.42.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: service-collector spec: diff --git a/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-deploy.yaml b/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-deploy.yaml index d492c2124..4518b9fe4 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-deploy.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-deploy.yaml @@ -5,10 +5,10 @@ kind: Deployment metadata: name: example-jaeger labels: - helm.sh/chart: jaeger-0.71.11 + helm.sh/chart: jaeger-0.69.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example - app.kubernetes.io/version: "1.45.0" + app.kubernetes.io/version: "1.42.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: all-in-one prometheus.io/port: "14269" @@ -44,7 +44,7 @@ spec: value: "false" - name: COLLECTOR_OTLP_ENABLED value: "true" - image: jaegertracing/all-in-one:1.45.0 + image: jaegertracing/all-in-one:1.42.0 imagePullPolicy: IfNotPresent name: jaeger args: @@ -96,6 +96,4 @@ spec: resources: limits: memory: 300Mi - volumeMounts: serviceAccountName: example-jaeger - volumes: diff --git a/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-query-svc.yaml b/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-query-svc.yaml index 032bee30f..da5bade96 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-query-svc.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-query-svc.yaml @@ -5,10 +5,10 @@ kind: Service metadata: name: example-jaeger-query labels: - helm.sh/chart: jaeger-0.71.11 + helm.sh/chart: jaeger-0.69.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example - app.kubernetes.io/version: "1.45.0" + app.kubernetes.io/version: "1.42.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: service-query spec: diff --git a/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-sa.yaml b/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-sa.yaml index fa14f6868..a5ae7bb57 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-sa.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/jaeger/allinone-sa.yaml @@ -5,9 +5,9 @@ kind: ServiceAccount metadata: name: example-jaeger labels: - helm.sh/chart: jaeger-0.71.11 + helm.sh/chart: jaeger-0.69.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example - app.kubernetes.io/version: "1.45.0" + app.kubernetes.io/version: "1.42.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: all-in-one diff --git a/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/configmap.yaml b/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/configmap.yaml index 1e65a6edd..dcf824542 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/configmap.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/configmap.yaml @@ -5,10 +5,10 @@ kind: ConfigMap metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.65.1 + helm.sh/chart: opentelemetry-collector-0.57.2 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.82.0" + app.kubernetes.io/version: "0.77.0" app.kubernetes.io/managed-by: Helm data: relay: | diff --git a/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/deployment.yaml b/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/deployment.yaml index 13c7ec436..71c2f5649 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/deployment.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/deployment.yaml @@ -5,10 +5,10 @@ kind: Deployment metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.65.1 + helm.sh/chart: opentelemetry-collector-0.57.2 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.82.0" + app.kubernetes.io/version: "0.77.0" app.kubernetes.io/managed-by: Helm spec: replicas: 1 @@ -23,7 +23,7 @@ spec: template: metadata: annotations: - checksum/config: 642250a36237ea6c5d9137695bbc2874323b1d1849096d6e61789e892007fbf3 + checksum/config: 330262db4024d8ef55d028492989fd4d8f77bb62c61f0f461b58ce2ff369ac80 opentelemetry_community_demo: "true" prometheus.io/port: "9464" prometheus.io/scrape: "true" @@ -44,7 +44,7 @@ spec: - --config=/conf/relay.yaml securityContext: {} - image: "otel/opentelemetry-collector-contrib:0.82.0" + image: "otel/opentelemetry-collector-contrib:0.77.0" imagePullPolicy: IfNotPresent ports: - name: jaeger-compact diff --git a/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/service.yaml b/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/service.yaml index d431f6ea5..5247e48b6 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/service.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/service.yaml @@ -5,10 +5,10 @@ kind: Service metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.65.1 + helm.sh/chart: opentelemetry-collector-0.57.2 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.82.0" + app.kubernetes.io/version: "0.77.0" app.kubernetes.io/managed-by: Helm component: standalone-collector spec: @@ -52,4 +52,3 @@ spec: app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example component: standalone-collector - internalTrafficPolicy: Cluster diff --git a/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/serviceaccount.yaml b/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/serviceaccount.yaml index 5601241bf..0b75edfb5 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/serviceaccount.yaml @@ -5,8 +5,8 @@ kind: ServiceAccount metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.65.1 + helm.sh/chart: opentelemetry-collector-0.57.2 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.82.0" + app.kubernetes.io/version: "0.77.0" app.kubernetes.io/managed-by: Helm diff --git a/charts/opentelemetry-demo/examples/default/rendered/prometheus/clusterrole.yaml b/charts/opentelemetry-demo/examples/default/rendered/prometheus/clusterrole.yaml index dc9341909..f33254581 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/prometheus/clusterrole.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/prometheus/clusterrole.yaml @@ -4,13 +4,11 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: - app.kubernetes.io/component: server - app.kubernetes.io/name: prometheus - app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.46.0 - helm.sh/chart: prometheus-23.3.0 - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/part-of: prometheus + component: "server" + app: prometheus + release: example + chart: prometheus-20.2.0 + heritage: Helm name: example-prometheus-server rules: - apiGroups: diff --git a/charts/opentelemetry-demo/examples/default/rendered/prometheus/clusterrolebinding.yaml b/charts/opentelemetry-demo/examples/default/rendered/prometheus/clusterrolebinding.yaml index 5b48ce6a0..114cb7979 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/prometheus/clusterrolebinding.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/prometheus/clusterrolebinding.yaml @@ -4,13 +4,11 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: labels: - app.kubernetes.io/component: server - app.kubernetes.io/name: prometheus - app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.46.0 - helm.sh/chart: prometheus-23.3.0 - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/part-of: prometheus + component: "server" + app: prometheus + release: example + chart: prometheus-20.2.0 + heritage: Helm name: example-prometheus-server subjects: - kind: ServiceAccount diff --git a/charts/opentelemetry-demo/examples/default/rendered/prometheus/cm.yaml b/charts/opentelemetry-demo/examples/default/rendered/prometheus/cm.yaml index a1d733410..149a9bebf 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/prometheus/cm.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/prometheus/cm.yaml @@ -4,13 +4,11 @@ apiVersion: v1 kind: ConfigMap metadata: labels: - app.kubernetes.io/component: server - app.kubernetes.io/name: prometheus - app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.46.0 - helm.sh/chart: prometheus-23.3.0 - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/part-of: prometheus + component: "server" + app: prometheus + release: example + chart: prometheus-20.2.0 + heritage: Helm name: example-prometheus-server namespace: default data: diff --git a/charts/opentelemetry-demo/examples/default/rendered/prometheus/deploy.yaml b/charts/opentelemetry-demo/examples/default/rendered/prometheus/deploy.yaml index cbf307609..b5578f03b 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/prometheus/deploy.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/prometheus/deploy.yaml @@ -4,43 +4,38 @@ apiVersion: apps/v1 kind: Deployment metadata: labels: - app.kubernetes.io/component: server - app.kubernetes.io/name: prometheus - app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.46.0 - helm.sh/chart: prometheus-23.3.0 - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/part-of: prometheus + component: "server" + app: prometheus + release: example + chart: prometheus-20.2.0 + heritage: Helm name: example-prometheus-server namespace: default spec: selector: matchLabels: - app.kubernetes.io/component: server - app.kubernetes.io/name: prometheus - app.kubernetes.io/instance: example + component: "server" + app: prometheus + release: example replicas: 1 - revisionHistoryLimit: 10 strategy: type: Recreate rollingUpdate: null template: metadata: labels: - app.kubernetes.io/component: server - app.kubernetes.io/name: prometheus - app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.46.0 - helm.sh/chart: prometheus-23.3.0 - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/part-of: prometheus + component: "server" + app: prometheus + release: example + chart: prometheus-20.2.0 + heritage: Helm spec: enableServiceLinks: true serviceAccountName: example-prometheus-server containers: - name: prometheus-server - image: "quay.io/prometheus/prometheus:v2.46.0" + image: "quay.io/prometheus/prometheus:v2.43.0" imagePullPolicy: "IfNotPresent" args: - --storage.tsdb.retention.time=15d diff --git a/charts/opentelemetry-demo/examples/default/rendered/prometheus/service.yaml b/charts/opentelemetry-demo/examples/default/rendered/prometheus/service.yaml index e184e9f0d..8e4cc196d 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/prometheus/service.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/prometheus/service.yaml @@ -4,13 +4,11 @@ apiVersion: v1 kind: Service metadata: labels: - app.kubernetes.io/component: server - app.kubernetes.io/name: prometheus - app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.46.0 - helm.sh/chart: prometheus-23.3.0 - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/part-of: prometheus + component: "server" + app: prometheus + release: example + chart: prometheus-20.2.0 + heritage: Helm name: example-prometheus-server namespace: default spec: @@ -20,8 +18,8 @@ spec: protocol: TCP targetPort: 9090 selector: - app.kubernetes.io/component: server - app.kubernetes.io/name: prometheus - app.kubernetes.io/instance: example + component: "server" + app: prometheus + release: example sessionAffinity: None type: "ClusterIP" diff --git a/charts/opentelemetry-demo/examples/default/rendered/prometheus/serviceaccount.yaml b/charts/opentelemetry-demo/examples/default/rendered/prometheus/serviceaccount.yaml index 1ebd2db1e..c9d51410f 100644 --- a/charts/opentelemetry-demo/examples/default/rendered/prometheus/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/default/rendered/prometheus/serviceaccount.yaml @@ -4,13 +4,11 @@ apiVersion: v1 kind: ServiceAccount metadata: labels: - app.kubernetes.io/component: server - app.kubernetes.io/name: prometheus - app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.46.0 - helm.sh/chart: prometheus-23.3.0 - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/part-of: prometheus + component: "server" + app: prometheus + release: example + chart: prometheus-20.2.0 + heritage: Helm name: example-prometheus-server namespace: default annotations: diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/clusterrole.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/clusterrole.yaml index 41ad3ca81..37dd3e814 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/clusterrole.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/clusterrole.yaml @@ -4,10 +4,10 @@ kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm name: example-grafana-clusterrole rules: [] diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/clusterrolebinding.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/clusterrolebinding.yaml index b29ae8821..1bb386013 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/clusterrolebinding.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/clusterrolebinding.yaml @@ -5,10 +5,10 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: example-grafana-clusterrolebinding labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm subjects: - kind: ServiceAccount diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/configmap.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/configmap.yaml index 1be423a56..d85c20ab6 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/configmap.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/configmap.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm data: grafana.ini: | diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/deployment.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/deployment.yaml index b65d0eb83..703abeec6 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/deployment.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/deployment.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm spec: replicas: 1 @@ -26,11 +26,10 @@ spec: app.kubernetes.io/name: grafana app.kubernetes.io/instance: example annotations: - checksum/config: faa523acbb15ce366dd2353d5417b71479ace592c9694e315997add86f6592bc + checksum/config: 0bd174d19e5d455ad71aea624e65ae51fd412a6b3c54fba8db25d85a897c0f1b checksum/dashboards-json-config: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b checksum/sc-dashboard-provider-config: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b - checksum/secret: a5b2dd94ad3d3c38ad2f31d52e0b0588f2df6263a230726d9f6673b8b23105da - kubectl.kubernetes.io/default-container: grafana + checksum/secret: 159754aaf8e3f63d0512321d2f4ec32957e240bc75210d5e24303e6d266666b4 spec: serviceAccountName: example-grafana @@ -38,20 +37,12 @@ spec: securityContext: fsGroup: 472 runAsGroup: 472 - runAsNonRoot: true runAsUser: 472 enableServiceLinks: true containers: - name: grafana - image: "docker.io/grafana/grafana:10.0.3" + image: "grafana/grafana:9.4.7" imagePullPolicy: IfNotPresent - securityContext: - allowPrivilegeEscalation: false - capabilities: - drop: - - ALL - seccompProfile: - type: RuntimeDefault volumeMounts: - name: config mountPath: "/etc/grafana/grafana.ini" diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/role.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/role.yaml index 4bb6ab1b9..ffe05e274 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/role.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/role.yaml @@ -6,9 +6,9 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm rules: [] diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/rolebinding.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/rolebinding.yaml index 3fb842746..2ff6b3d95 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/rolebinding.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/rolebinding.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/secret.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/secret.yaml index 5945da59c..8ca5ebfc6 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/secret.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/secret.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm type: Opaque data: diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/service.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/service.yaml index 397a3d56c..20e30b774 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/service.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/service.yaml @@ -6,10 +6,10 @@ metadata: name: example-grafana namespace: default labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm spec: type: ClusterIP diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/serviceaccount.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/serviceaccount.yaml index 7bdd349a1..2d4090b96 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/serviceaccount.yaml @@ -4,10 +4,10 @@ apiVersion: v1 kind: ServiceAccount metadata: labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm name: example-grafana namespace: default diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/tests/test-configmap.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/tests/test-configmap.yaml index 22511fc1f..783067d38 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/tests/test-configmap.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/tests/test-configmap.yaml @@ -9,10 +9,10 @@ metadata: "helm.sh/hook": test-success "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded" labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm data: run.sh: |- diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/tests/test-serviceaccount.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/tests/test-serviceaccount.yaml index 9cf86f6c9..5b43f7194 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/tests/test-serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/tests/test-serviceaccount.yaml @@ -4,10 +4,10 @@ apiVersion: v1 kind: ServiceAccount metadata: labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm name: example-grafana-test namespace: default diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/tests/test.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/tests/test.yaml index ae03b9581..27a0e8224 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/tests/test.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana/tests/test.yaml @@ -5,10 +5,10 @@ kind: Pod metadata: name: example-grafana-test labels: - helm.sh/chart: grafana-6.58.8 + helm.sh/chart: grafana-6.52.8 app.kubernetes.io/name: grafana app.kubernetes.io/instance: example - app.kubernetes.io/version: "10.0.3" + app.kubernetes.io/version: "9.4.7" app.kubernetes.io/managed-by: Helm annotations: "helm.sh/hook": test-success @@ -18,7 +18,7 @@ spec: serviceAccountName: example-grafana-test containers: - name: example-test - image: "docker.io/bats/bats:v1.4.1" + image: "bats/bats:v1.4.1" imagePullPolicy: "IfNotPresent" command: ["/opt/bats/bin/bats", "-t", "/tests/run.sh"] volumeMounts: diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-agent-svc.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-agent-svc.yaml index 19d9ec47c..13c4b0a18 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-agent-svc.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-agent-svc.yaml @@ -5,10 +5,10 @@ kind: Service metadata: name: example-jaeger-agent labels: - helm.sh/chart: jaeger-0.71.11 + helm.sh/chart: jaeger-0.69.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example - app.kubernetes.io/version: "1.45.0" + app.kubernetes.io/version: "1.42.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: service-agent spec: diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-collector-svc.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-collector-svc.yaml index 1232c2f82..8786c0e7b 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-collector-svc.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-collector-svc.yaml @@ -5,10 +5,10 @@ kind: Service metadata: name: example-jaeger-collector labels: - helm.sh/chart: jaeger-0.71.11 + helm.sh/chart: jaeger-0.69.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example - app.kubernetes.io/version: "1.45.0" + app.kubernetes.io/version: "1.42.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: service-collector spec: diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-deploy.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-deploy.yaml index d492c2124..4518b9fe4 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-deploy.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-deploy.yaml @@ -5,10 +5,10 @@ kind: Deployment metadata: name: example-jaeger labels: - helm.sh/chart: jaeger-0.71.11 + helm.sh/chart: jaeger-0.69.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example - app.kubernetes.io/version: "1.45.0" + app.kubernetes.io/version: "1.42.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: all-in-one prometheus.io/port: "14269" @@ -44,7 +44,7 @@ spec: value: "false" - name: COLLECTOR_OTLP_ENABLED value: "true" - image: jaegertracing/all-in-one:1.45.0 + image: jaegertracing/all-in-one:1.42.0 imagePullPolicy: IfNotPresent name: jaeger args: @@ -96,6 +96,4 @@ spec: resources: limits: memory: 300Mi - volumeMounts: serviceAccountName: example-jaeger - volumes: diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-query-svc.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-query-svc.yaml index 032bee30f..da5bade96 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-query-svc.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-query-svc.yaml @@ -5,10 +5,10 @@ kind: Service metadata: name: example-jaeger-query labels: - helm.sh/chart: jaeger-0.71.11 + helm.sh/chart: jaeger-0.69.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example - app.kubernetes.io/version: "1.45.0" + app.kubernetes.io/version: "1.42.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: service-query spec: diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-sa.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-sa.yaml index fa14f6868..a5ae7bb57 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-sa.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/jaeger/allinone-sa.yaml @@ -5,9 +5,9 @@ kind: ServiceAccount metadata: name: example-jaeger labels: - helm.sh/chart: jaeger-0.71.11 + helm.sh/chart: jaeger-0.69.1 app.kubernetes.io/name: jaeger app.kubernetes.io/instance: example - app.kubernetes.io/version: "1.45.0" + app.kubernetes.io/version: "1.42.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: all-in-one diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/configmap.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/configmap.yaml index 1e65a6edd..dcf824542 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/configmap.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/configmap.yaml @@ -5,10 +5,10 @@ kind: ConfigMap metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.65.1 + helm.sh/chart: opentelemetry-collector-0.57.2 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.82.0" + app.kubernetes.io/version: "0.77.0" app.kubernetes.io/managed-by: Helm data: relay: | diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/deployment.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/deployment.yaml index 13c7ec436..71c2f5649 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/deployment.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/deployment.yaml @@ -5,10 +5,10 @@ kind: Deployment metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.65.1 + helm.sh/chart: opentelemetry-collector-0.57.2 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.82.0" + app.kubernetes.io/version: "0.77.0" app.kubernetes.io/managed-by: Helm spec: replicas: 1 @@ -23,7 +23,7 @@ spec: template: metadata: annotations: - checksum/config: 642250a36237ea6c5d9137695bbc2874323b1d1849096d6e61789e892007fbf3 + checksum/config: 330262db4024d8ef55d028492989fd4d8f77bb62c61f0f461b58ce2ff369ac80 opentelemetry_community_demo: "true" prometheus.io/port: "9464" prometheus.io/scrape: "true" @@ -44,7 +44,7 @@ spec: - --config=/conf/relay.yaml securityContext: {} - image: "otel/opentelemetry-collector-contrib:0.82.0" + image: "otel/opentelemetry-collector-contrib:0.77.0" imagePullPolicy: IfNotPresent ports: - name: jaeger-compact diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/ingress.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/ingress.yaml index 2bc7209e9..16756a929 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/ingress.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/ingress.yaml @@ -5,10 +5,10 @@ kind: Ingress metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.65.1 + helm.sh/chart: opentelemetry-collector-0.57.2 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.82.0" + app.kubernetes.io/version: "0.77.0" app.kubernetes.io/managed-by: Helm component: standalone-collector spec: diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/service.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/service.yaml index d431f6ea5..5247e48b6 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/service.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/service.yaml @@ -5,10 +5,10 @@ kind: Service metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.65.1 + helm.sh/chart: opentelemetry-collector-0.57.2 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.82.0" + app.kubernetes.io/version: "0.77.0" app.kubernetes.io/managed-by: Helm component: standalone-collector spec: @@ -52,4 +52,3 @@ spec: app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example component: standalone-collector - internalTrafficPolicy: Cluster diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/serviceaccount.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/serviceaccount.yaml index 5601241bf..0b75edfb5 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/serviceaccount.yaml @@ -5,8 +5,8 @@ kind: ServiceAccount metadata: name: example-otelcol labels: - helm.sh/chart: opentelemetry-collector-0.65.1 + helm.sh/chart: opentelemetry-collector-0.57.2 app.kubernetes.io/name: otelcol app.kubernetes.io/instance: example - app.kubernetes.io/version: "0.82.0" + app.kubernetes.io/version: "0.77.0" app.kubernetes.io/managed-by: Helm diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/clusterrole.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/clusterrole.yaml index dc9341909..f33254581 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/clusterrole.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/clusterrole.yaml @@ -4,13 +4,11 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: - app.kubernetes.io/component: server - app.kubernetes.io/name: prometheus - app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.46.0 - helm.sh/chart: prometheus-23.3.0 - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/part-of: prometheus + component: "server" + app: prometheus + release: example + chart: prometheus-20.2.0 + heritage: Helm name: example-prometheus-server rules: - apiGroups: diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/clusterrolebinding.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/clusterrolebinding.yaml index 5b48ce6a0..114cb7979 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/clusterrolebinding.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/clusterrolebinding.yaml @@ -4,13 +4,11 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: labels: - app.kubernetes.io/component: server - app.kubernetes.io/name: prometheus - app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.46.0 - helm.sh/chart: prometheus-23.3.0 - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/part-of: prometheus + component: "server" + app: prometheus + release: example + chart: prometheus-20.2.0 + heritage: Helm name: example-prometheus-server subjects: - kind: ServiceAccount diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/cm.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/cm.yaml index a1d733410..149a9bebf 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/cm.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/cm.yaml @@ -4,13 +4,11 @@ apiVersion: v1 kind: ConfigMap metadata: labels: - app.kubernetes.io/component: server - app.kubernetes.io/name: prometheus - app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.46.0 - helm.sh/chart: prometheus-23.3.0 - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/part-of: prometheus + component: "server" + app: prometheus + release: example + chart: prometheus-20.2.0 + heritage: Helm name: example-prometheus-server namespace: default data: diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/deploy.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/deploy.yaml index cbf307609..b5578f03b 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/deploy.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/deploy.yaml @@ -4,43 +4,38 @@ apiVersion: apps/v1 kind: Deployment metadata: labels: - app.kubernetes.io/component: server - app.kubernetes.io/name: prometheus - app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.46.0 - helm.sh/chart: prometheus-23.3.0 - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/part-of: prometheus + component: "server" + app: prometheus + release: example + chart: prometheus-20.2.0 + heritage: Helm name: example-prometheus-server namespace: default spec: selector: matchLabels: - app.kubernetes.io/component: server - app.kubernetes.io/name: prometheus - app.kubernetes.io/instance: example + component: "server" + app: prometheus + release: example replicas: 1 - revisionHistoryLimit: 10 strategy: type: Recreate rollingUpdate: null template: metadata: labels: - app.kubernetes.io/component: server - app.kubernetes.io/name: prometheus - app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.46.0 - helm.sh/chart: prometheus-23.3.0 - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/part-of: prometheus + component: "server" + app: prometheus + release: example + chart: prometheus-20.2.0 + heritage: Helm spec: enableServiceLinks: true serviceAccountName: example-prometheus-server containers: - name: prometheus-server - image: "quay.io/prometheus/prometheus:v2.46.0" + image: "quay.io/prometheus/prometheus:v2.43.0" imagePullPolicy: "IfNotPresent" args: - --storage.tsdb.retention.time=15d diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/service.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/service.yaml index e184e9f0d..8e4cc196d 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/service.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/service.yaml @@ -4,13 +4,11 @@ apiVersion: v1 kind: Service metadata: labels: - app.kubernetes.io/component: server - app.kubernetes.io/name: prometheus - app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.46.0 - helm.sh/chart: prometheus-23.3.0 - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/part-of: prometheus + component: "server" + app: prometheus + release: example + chart: prometheus-20.2.0 + heritage: Helm name: example-prometheus-server namespace: default spec: @@ -20,8 +18,8 @@ spec: protocol: TCP targetPort: 9090 selector: - app.kubernetes.io/component: server - app.kubernetes.io/name: prometheus - app.kubernetes.io/instance: example + component: "server" + app: prometheus + release: example sessionAffinity: None type: "ClusterIP" diff --git a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/serviceaccount.yaml b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/serviceaccount.yaml index 1ebd2db1e..c9d51410f 100644 --- a/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/serviceaccount.yaml +++ b/charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/prometheus/serviceaccount.yaml @@ -4,13 +4,11 @@ apiVersion: v1 kind: ServiceAccount metadata: labels: - app.kubernetes.io/component: server - app.kubernetes.io/name: prometheus - app.kubernetes.io/instance: example - app.kubernetes.io/version: v2.46.0 - helm.sh/chart: prometheus-23.3.0 - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/part-of: prometheus + component: "server" + app: prometheus + release: example + chart: prometheus-20.2.0 + heritage: Helm name: example-prometheus-server namespace: default annotations: